Update translations

53 files changed, 46522 insertions, 35238 deletions

diff --git a/docs/docs/stable/installer/ca.po b/docs/docs/stable/installer/ca.po
index 3efda2ce..c6afd5e5 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-23 15:22+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -33,12 +33,13 @@ msgstr "Llicència i notes de la versió"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -71,8 +72,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Per acceptar-los, seleccioneu <guilabel>Accepta</guilabel> i després feu "
@@ -94,9 +96,10 @@ msgstr "Notes de la versió"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Hi ha informació important sobre aquesta versió de <application>Mageia</"
@@ -104,13 +107,13 @@ msgstr ""
 "versió</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "ca"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Selecció dels mitjans (configura els mitjans d'instal·lació suplementaris)"
@@ -119,23 +122,25 @@ msgstr ""
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Aquesta pantalla us mostra la llista dels dipòsits ja reconeguts. Podeu "
 "afegir altres orígens de paquets, com ara un disc òptic i bé un origen "
@@ -143,23 +148,25 @@ msgstr ""
 "per a ser seleccionats en els següents passos."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Per a un origen en xarxa cal seguir dos passos:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Tria i activació de la xarxa, si encara no està activa."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Selecció d'una rèplica o especificació d'un URL (la primera entrada). En "
 "seleccionar una rèplica teniu accés a la selecció de tots els dipòsits "
@@ -167,14 +174,15 @@ msgstr ""
 "designar un dipòsit específic o la vostra pròpia instal·lació NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Si esteu actualitzant una instal·lació de 64 bits que pot contenir alguns "
 "paquets de 32 bits, s'aconsella utilitzar aquesta finestra per afegir una "
@@ -191,7 +199,7 @@ msgstr "Gestió d'usuaris i superusuari"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -204,21 +212,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Estableix la contrasenya d'administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Per a qualsevol instal·lació de <application>Mageia</application> és "
 "aconsellable que establiu una contrasenya de superusuari o administrador, "
@@ -230,9 +238,10 @@ msgstr ""
 "comparació que no heu teclejat malament la primera contrasenya."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Totes les contrasenyes distingeixen entre majúscules i minúscules. És "
@@ -240,16 +249,18 @@ msgstr ""
 "nombres i altres caràcters."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduïu un usuari"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Afegiu aquí un usuari. Un usuari té menys permisos que el superusuari "
 "(root), però prou per a navegar per Internet, fer servir aplicacions "
@@ -257,7 +268,7 @@ msgstr ""
 "el seu ordinador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -266,17 +277,18 @@ msgstr ""
 "d'usuari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
 msgstr "<guilabel>Nom real</guilabel>: poseu-hi el nom real de l'usuari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Nom de connexió</guilabel>: poseu-hi el nom de connexió de "
@@ -285,123 +297,95 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Contrasenya</guilabel>: en aquesta casella hauríeu d'escriure la "
 "contrasenya de l'usuari. Hi ha un camp al final que indica la força de la "
 "contrasenya. (Vegeu també <xref linkend=\"givePassword\"/>.)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Contrasenya (una altra vegada)</guilabel>: torneu a escriure-hi la "
 "contrasenya i drakx comprovarà que hi hagi la mateixa contrasenya en les "
 "dues caselles."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "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:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gestió avançada d'usuaris"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
-msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "A més, podeu habilitar o inhabilitar un compte de convidat."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Tot allò que un convidat, amb un compte predeterminat <emphasis>rbash</"
-"emphasis>, desi al seu directori /home serà esborrat quan tanqui la sessió. "
-"El convidat hauria de desar els fitxers importants en una memòria USB."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:96
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
-"<guilabel>Habilita el compte de convidat</guilabel>: aquí podeu habilitar o "
-"inhabilitar el compte d'un convidat. Aquest tipus de compte permet a un "
-"convidat iniciar la sessió i utilitzar el PC, però té un accés més "
-"restringit que els usuaris normals."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell d'inici de sessió</guilabel>: aquesta llista desplegable us "
 "permet canviar el shell d'inici de sessió utilitzat per a l'usuari que "
 "acabeu d'afegir a la pantalla anterior. Les opcions són Bash, Dash i Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Id. d'usuari</guilabel>: aquí podeu establir l'id. d'usuari per a "
 "l'usuari que acabeu d'afegir a la pantalla anterior. És un nombre. Deixeu-lo "
 "en blanc excepte si sabeu què esteu fent."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Id. de grup</guilabel>: aquí podeu establir l'id. de grup. També "
-"és un nombre, habitualment el mateix que per a l'usuari. Deixeu-ho en blanc "
-"excepte si sabeu què esteu fent."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Tria dels punts de muntatge"
 
@@ -418,17 +402,22 @@ msgstr "Tria dels punts de muntatge"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -439,41 +428,45 @@ msgstr ""
 "podeu canviar els punts de muntatge."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Si canvieu alguna cosa, assegureu-vos que encara teniu una partició "
 "<literal>/</literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Cada partició es mostra així: «Dispositiu» («Capacitat», «Punt de muntatge», "
 "«Tipus»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"«Dispositiu» es compon de: «unitat de disc dur», [«número d'unitat de disc "
-"dur»(lletra)], «número de partició» (per exemple, «sda5»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Si teniu diverses particions, podeu triar diversos punts de muntatge amb el "
 "menú desplegable, com ara <literal>/</literal>, <literal>/home</literal> i "
@@ -483,20 +476,22 @@ msgstr ""
 "la partició <literal>/home</literal> de la instal·lació cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Per a les particions a les quals no heu d'accedir, podeu deixar el camp del "
 "punt de muntatge en blanc."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Trieu <guibutton>Anterior</guibutton> si no esteu segur de què triar, i "
 "llavors marqueu <guilabel>Partició personalitzada de disc</guilabel>. A la "
@@ -504,7 +499,7 @@ msgstr ""
 "mida. "
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -729,8 +724,9 @@ msgstr "Selecció de l'escriptori"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "En funció de la selecció que feu aquí, se us poden oferir altres pantalles "
@@ -738,8 +734,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -756,14 +753,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Trieu si preferiu utilitzar l'entorn d'escriptori <application>KDE</"
 "application> o bé <application>Gnome</application>. Ambdós porten un conjunt "
@@ -789,8 +788,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -801,24 +801,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Estació de treball."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis>Personalitzat</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Servidor."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Entorn gràfic."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Selecció individual de paquets: podeu utilitzar aquesta opció per afegir o "
 "eliminar paquets individualment."
@@ -826,35 +830,37 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Tria de paquets individuals"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Aquí podeu afegir o eliminar qualsevol paquet extra per a personalitzar la "
 "instal·lació."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -869,47 +875,46 @@ msgstr ""
 "mateix botó durant la instal·lació i trieu l'opció de carregar-lo."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configuració dels serveis"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
 "\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Aquí podeu establir quins serveis cal (o no) iniciar quan s'engega "
 "l'ordinador."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Hi ha quatre grups, feu clic sobre el triangle que hi ha abans de cada grup "
-"per a expandir-lo i mostrar tots els serveis que conté."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Generalment, la tria feta per DrakX és la bona."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -917,7 +922,7 @@ msgstr ""
 "Si realceu un servei, se us en mostrarà informació a la casella inferior."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Canvieu coses només si teniu molt clar què esteu fent."
 
@@ -930,28 +935,35 @@ msgstr "Configuració de la zona horària"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Trieu la zona horària escollint un país o bé una ciutat propera a la mateixa "
 "zona horària."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "A la següent pantalla podreu triar si establiu el rellotge de maquinari a "
 "l'hora local o bé a GMT, també coneguda com a UTC."
@@ -966,23 +978,24 @@ 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:11
+#: en/configureX_card_list.xml:13
 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:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -991,7 +1004,7 @@ msgstr ""
 "identifica correctament el dispositiu de vídeo."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1000,100 +1013,97 @@ msgstr ""
 "quina és, seleccioneu-la a l'arbre:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "fabricant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "llavors el nom de la targeta"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "i el tipus de targeta"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Si no trobeu la vostra targeta a la llista de proveïdors (perquè encara no "
-"és a la base de dades o bé perquè és antiga) potser encara podeu trobar un "
-"controlador adequat a la categoria Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "El llistat de Xorg proporciona més de 40 controladors genèrics i lliures. Si "
 "tot i això encara no trobeu el controlador adequat, hi ha l'opció de fer "
 "servir el controlador VESA, que proporciona funcionalitats bàsiques."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Tingueu en compte que si seleccioneu un controlador incompatible, potser "
 "només teniu accés a la interfície de línia d'ordres."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Alguns fabricants de targetes de vídeo proporcionen controladors de "
 "propietat per a Linux, que només estan disponibles al dipòsit Nonfree o bé, "
 "en alguns casos, als llocs web dels fabricants."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Cal activar explícitament els dipòsits Nonfree per poder-hi accedir. Si "
 "encara no ho heu fet, ho podreu fer després que reinicieu per primera vegada."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Sigui quin sigui l'entorn gràfic (també anomenat entorn d'escriptori) triat "
 "per a aquesta instal·lació de <application>Mageia</application>, està basat "
@@ -1106,7 +1116,7 @@ msgstr ""
 "fet bé, corregiu-los."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1115,13 +1125,14 @@ msgstr ""
 "la vostra targeta de la llista."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: podeu triar "
 "<guilabel>Plug'n Play</guilabel> quan sigui possible, o bé trieu un monitor "
@@ -1130,30 +1141,31 @@ msgstr ""
 "manualment les freqüències de refresc horitzontal i vertical del monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Freqüències de refresc incorrectes poden fer malbé el monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Resolució</guibutton></emphasis>: aquí establiu la "
 "resolució i profunditat de color del monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Prova</guibutton></emphasis>: el botó de prova no "
 "sempre apareix durant la instal·lació. Si hi surt i el pressioneu, podeu "
@@ -1164,7 +1176,7 @@ msgstr ""
 "disponible, assegureu-vos que la configuració és conservadora</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1173,12 +1185,12 @@ msgstr ""
 "activar o desactivar diverses opcions."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Tria del monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1187,12 +1199,13 @@ msgstr ""
 "identificarà correctament el vostre."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>La selecció d'un monitor amb característiques diferents podria fer "
 "malbé el monitor o el maquinari de vídeo. No intenteu res si no teniu clar "
@@ -1200,23 +1213,23 @@ msgstr ""
 "documentació del monitor"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalitzat</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1230,7 +1243,7 @@ msgstr ""
 "mostren les línies."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1243,12 +1256,12 @@ msgstr ""
 "conservadora i consulteu la documentació del monitor."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Integració automàtica</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1257,12 +1270,12 @@ msgstr ""
 "partir de la base de dades."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1271,28 +1284,30 @@ msgstr ""
 "podeu seleccionar de l'arbre:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "el nom dels fabricants del monitor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "descripció del monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Genèric</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Seleccionant aquest grup se us presentaran gairebé 30 configuracions de "
 "pantalles, per exemple 1024x768 @ 60 Hz i inclou pantalles planes com les "
@@ -1301,12 +1316,12 @@ msgstr ""
 "automàticament. De nou, sigueu prudents en les vostres seleccions."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particions personalitzades del disc amb DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1314,12 +1329,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Si voleu utilitzar el xifratge a la partició <literal>/</literal>, assegureu-"
 "vos que teniu una partició <literal>/boot</literal> separada. Cal que "
@@ -1327,82 +1344,86 @@ msgstr ""
 "literal>. Altrament, el sistema no arrencarà."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Hi ha una pestanya per a cada disc dur o altre dispositiu d'emmagatzematge "
-"detectats, com ara un llapis de memòria USB. Per exemple, sda, sdb i sdc si "
-"n'hi ha tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Premeu <guibutton>Neteja-ho tot</guibutton> per a eliminar totes les "
 "particions del dispositiu d'emmagatzematge seleccionat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continueu fins que tot sigui del vostre grat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1411,32 +1432,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Particions"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "En aquesta pantalla podeu veure en contingut del(s) disc(s) dur(s) i les "
 "propostes de l'auxiliar de particions de DrakX sobre on instal·lar "
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Les opcions disponibles a la llista de sota poden variar en funció de la "
 "disposició i contingut del(s) vostre(s) disc(s) dur(s) en particular."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1445,12 +1468,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Utilitza les particions existents"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1459,12 +1482,12 @@ msgstr ""
 "compatibles amb Linux i es podrien utilitzar per a la instal·lació."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Utilitza l'espai lliure"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1473,12 +1496,12 @@ msgstr ""
 "instal·lació de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utilitza l'espai lliure en una partició Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1487,7 +1510,7 @@ msgstr ""
 "l'instal·lador us proposi utilitzar-la."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1498,7 +1521,7 @@ msgstr ""
 "una còpia de seguretat dels fitxers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1516,41 +1539,48 @@ msgstr ""
 "personals."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:45
+#: 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:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Aquesta opció utilitzarà tota la unitat per a Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1560,12 +1590,12 @@ msgstr ""
 "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:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Particions personalitzades de disc"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1574,74 +1604,83 @@ msgstr ""
 "al(s) disc(s) dur(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1649,22 +1688,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Alguns discs nous fan servir ara sectors lògics de 4096 bytes, en lloc dels "
 "sectors lògics de 512 bytes, estàndards fins ara. A causa de la manca de "
@@ -1676,19 +1716,22 @@ msgstr ""
 "gparted, i feu servir la configuració següent:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Alinea a\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis>Integració automàtica</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
 msgstr "\"Espai lliure que precedeix a (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Assegureu-vos també que totes les particions s'han creat amb un nombre "
 "parell de megabytes."
@@ -1699,7 +1742,7 @@ 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:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1714,18 +1757,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Documentació oficial de Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1737,7 +1780,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1749,7 +1792,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1761,13 +1804,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1779,26 +1822,34 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instal·lació amb DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Febrer del 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1806,14 +1857,14 @@ msgstr "Enhorabona"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1823,16 +1874,17 @@ msgstr ""
 "és segur treure el mitjà d'instal·lació i arrencar de nou l'ordinador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Després de l'arrencada, a la pantalla del gestor d'arrencada podeu triar "
 "entre els diversos sistemes operatius instal·lats (si n'hi ha més d'un)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1841,12 +1893,12 @@ msgstr ""
 "seleccionarà i iniciarà la vostra instal·lació de Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Gaudiu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1861,31 +1913,31 @@ msgstr "Tallafoc"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1896,20 +1948,18 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1917,28 +1967,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatació"
 
@@ -1947,34 +1997,39 @@ msgstr "Formatació"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Aquí podeu triar les particions que voleu formatar. Es conservaran totes les "
 "dades de les particions que <emphasis>no</emphasis> estiguin marcades per a "
 "formatar."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Normalment cal formatar com a mínim les particions seleccionades per DrakX."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -1983,12 +2038,13 @@ msgstr ""
 "voleu comprovar si hi ha <emphasis>blocs defectuosos</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Si no esteu segur d'haver triat l'opció correcta, podeu clicar a "
 "<guibutton>Anterior</guibutton>, novament a <guibutton>Anterior</guibutton> "
@@ -1997,7 +2053,7 @@ msgstr ""
 "particions."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2006,12 +2062,12 @@ msgstr ""
 "per continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'instal·lador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2022,7 +2078,7 @@ msgstr ""
 "instal·lació o actualització tan fàcil com sigui possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2031,273 +2087,252 @@ msgstr ""
 "predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: 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:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Ús d'un DVD de Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Utilitzeu les tecles de les fletxes per a seleccionar l'idioma i premeu la "
 "tecla de retorn."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Per defecte, no altera res en les opcions per defecte."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Per defecte, no altera res en les opcions per defecte."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Sense ACPI (Advanced Configuration and Power Interface), no es té en "
 "compte la gestió del consum."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Sense APIC local (Local Advanced Programmable Interrupt Controller), sobre "
 "interrupcions de la CPU, seleccioneu aquesta opció si us la demana."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Amb la tecla F2 l'ajuda es tradueix a l'idioma seleccionat."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "La disposició del teclat és l'americana."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Passos de la instal·lació"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "El procés d'instal·lació està dividit en un seguit de passos, que es poden "
 "veure en el plafó lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Cada pas té una o més pantalles, que a la vegada poden tenir "
 "botons<guibutton>Avançat</guibutton> amb opcions suplementàries menys "
 "habituals."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "La majoria de les pantalles tenen un botó <guibutton>Ajuda</guibutton> que "
 "dóna més explicacions sobre el pas actual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2315,17 +2350,17 @@ msgstr ""
 "Ctrl Delete </guibutton> per a reiniciar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 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:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Sense interfície gràfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2337,22 +2372,24 @@ msgstr ""
 "consola."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "La instal·lació es penja"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2367,14 +2404,15 @@ msgstr ""
 "d'altres."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problema en la RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2386,18 +2424,19 @@ msgstr ""
 "significaria 256 MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Particions dinàmiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2410,10 +2449,11 @@ msgstr "Actualitzacions"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
@@ -2421,7 +2461,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2430,10 +2470,11 @@ msgstr ""
 "s'han actualitzat o millorat alguns paquets."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Trieu <guilabel>Sí</guilabel> si voleu baixar-los i instal·lar-los, trieu "
@@ -2441,8 +2482,9 @@ msgstr ""
 "Internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Llavors premeu <guibutton>Següent</guibutton> per a continuar."
 
 #. type: Content of: <section><info><title>
@@ -2496,18 +2538,18 @@ msgstr "Selecció del mitjà (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2520,7 +2562,7 @@ msgstr ""
 "seleccionar durant els següents passos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2529,7 +2571,7 @@ msgstr ""
 "base de la instal·lació."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2544,13 +2586,14 @@ msgstr ""
 "Fi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "El dipòsit <emphasis>Tainted</emphasis> inclou paquets publicats sota una "
 "llicència lliure. El principal criteri per a posar-los en aquest dipòsit és "
@@ -2559,56 +2602,58 @@ msgstr ""
 "o de vídeo; paquets per a poder reproduir DVD de vídeo comercials, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instal·lació mínima"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Podeu triar una instal·lació mínima desseleccionant-ho tot a la pantalla de "
 "selecció de grups de paquets. Vegeu <xref linkend=\"choosePackageGroups\"></"
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Si seleccioneu aquesta classe d'instal·lació, la pantalla següent us "
 "proposarà d'instal·lar alguns extres útils, com ara la documentació i les X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2618,15 +2663,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2642,11 +2687,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX ha fet unes tries adequades per a la configuració del sistema, en "
 "funció de les tries que heu fet i del maquinari detectat. Podeu comprovar "
@@ -2656,8 +2702,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2672,71 +2718,73 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Paràmetres del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zona horària</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX us ha triat una zona horària basant-se en l'idioma de preferència. Si "
 "cal, ho podeu canviar. Vegeu també <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Regió</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Si no us trobeu al país seleccionat, és molt important que corregiu la "
 "configuració. Vegeu <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Gestor d'arrencada</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "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:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: 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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Per a més informació vegeu <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestió d'usuaris</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2745,22 +2793,23 @@ msgstr ""
 "directori <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Serveis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Els serveis de sistema es refereixen a petits programes que corren en segon "
 "pla (dimonis). Aquesta eina us permet habilitar o inhabilitar determinades "
 "tasques."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2769,43 +2818,44 @@ msgstr ""
 "l'ordinador no funcionés correctament."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Per a més informació vegeu <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Paràmetres del maquinari"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclat</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Aquí és on establiu o canvieu la disposició del teclat, que depèn de la "
 "vostra ubicació, idioma o tipus de teclat."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ratolí</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2814,59 +2864,61 @@ msgstr ""
 "ratolins de bola, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Targeta de so</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "L'instal·lador fa servir un controlador predeterminat, si n'hi ha un. "
 "L'opció de seleccionar un controlador diferent només apareix quan hi ha més "
 "d'un controlador per a la targeta, però cap d'ells és el predeterminat."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfície gràfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Aquesta secció us permet configurar la targeta gràfica i les pantalles."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Per a més informació vegeu <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Paràmetres de xarxa i Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Xarxa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -2876,21 +2928,22 @@ msgstr ""
 "control de Mageia</application>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Quan afegiu una targeta de xarxa, no us oblideu de configurar el tallafoc "
 "perquè vigili també aquella interfície."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Servidors intermediaris</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2901,26 +2954,27 @@ msgstr ""
 "intermediari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Potser heu de consultar l'administrador de sistemes per a obtenir els "
 "paràmetres que cal posar aquí"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Seguretat"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivell de seguretat</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2930,17 +2984,17 @@ msgstr ""
 "general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Trieu l'opció que millor s'adapta a la vostra utilització."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tallafoc</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -2950,7 +3004,7 @@ msgstr ""
 "les."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2958,7 +3012,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Tingueu present que el fet de permetre-ho tot (sense tallafoc) pot ser molt "
@@ -3019,39 +3073,72 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Aquí podeu ajustar el nivell de seguretat."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Si no sabeu què triar, no toqueu les opcions predeterminades."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Després de la instal·lació sempre és possible ajustar la configuració de "
 "seguretat a la part de <guilabel>Seguretat</guilabel> del centre de control "
@@ -3071,108 +3158,113 @@ msgstr "Introducció"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Mitjà"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definició"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Els podeu trobar <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">aquí</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Mitjans d'instal·lació clàssics"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Característiques comunes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Aquestes ISO utilitzen l'instal·lador clàssic anomenat drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Poden fer una instal·lació neta o bé una actualització des de versions "
 "anteriors."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Mitjans diferents per a les arquitectures de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 "Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3180,123 +3272,127 @@ msgstr ""
 "propietat."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Mitjà autònom"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Es pot utilitzar per a la vista prèvia de la distribució sense instal·lar-la "
 "al disc dur, amb la possibilitat d'instal·lar Mageia al vostre disc dur si "
 "ho voleu."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Contenen programari de propietat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "DVD autònom de Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 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:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Conté tots els idiomes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Només l'arquitectura de 64 bits."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "DVD autònom de GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 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:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "DVD autònom de Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 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:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "Arquitectures de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Mitjà de CD de només d'arrencada"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Mitjans d'instal·lació clàssics"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Només en anglès."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3330,9 +3426,9 @@ msgstr "Baixada"
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3343,9 +3439,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3355,7 +3451,7 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3364,84 +3460,96 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Obriu una consola, no cal que sigueu root, i:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Per a fer servir md5sum, teclegeu: [sam@localhost]$ <userinput>md5sum camí/"
 "cap/a/la/imatge/fitxer.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Per a fer servir sha1sum, teclegeu [sam@localhost]$ <userinput>sha1sum "
 "camí/cap/a/la/imatge/fitxer.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Enregistrament o bolcat de l'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 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:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 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:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3451,15 +3559,15 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3468,106 +3576,111 @@ msgstr ""
 "formatar la memòria USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Podeu provar:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "També podeu fer servir l'eina dd en una consola:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Obriu una consola"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Convertiu-vos en root amb l'ordre <userinput>su -</userinput> (no oblideu el "
 "«-» final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Introduïu l'ordre <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3591,42 +3704,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Introduïu l'ordre: # <userinput>dd if=camí/al/fitxer/ISO of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "On X=nom del dispositiu, per exemple: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Introduïu l'ordre: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Desconnecteu el llapis de memòria USB, ja està"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3651,19 +3774,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Si el vostre país no es troba a la llista, feu clic a <guilabel>Altres "
 "països</guilabel> i trieu-hi el país o regió."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Si el vostre país es troba únicament dins de la llista d'<guilabel>Altres "
@@ -3672,79 +3797,79 @@ msgstr ""
 "cas, DrakX respectarà la tria."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Mètode d'entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instal·lació o actualització"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instal·la"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Utilitzeu aquesta opció per a una nova instal·lació de <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Actualització"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Si teniu una o més instal·lacions de <application>Mageia</application> en el "
-"sistema, l'instal·lador us permetrà actualitzar-ne una a la darrera versió."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Només s'ha provat completament l'actualització a partir d'una versió de "
 "Mageia que <emphasis>encara fos compatible</emphasis> en el moment de "
@@ -3753,16 +3878,17 @@ msgstr ""
 "fer una instal·lació neta, conservant la partició <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Si durant la instal·lació decidiu aturar-la, és possible reiniciar "
 "l'ordinador, però penseu-vos-ho bé abans de fer-ho. Un cop s'ha formatat una "
@@ -3774,12 +3900,14 @@ msgstr ""
 "Delete</guibutton> alhora per a reiniciar."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Si us adoneu que us heu oblidat de seleccionar un idioma addicional, podeu "
 "tornar des de la pantalla «Instal·la o actualitza» cap a la pantalla de "
@@ -3808,12 +3936,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Teclat"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3822,16 +3950,17 @@ msgstr ""
 "triarà la disposició de teclat US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3849,23 +3978,25 @@ msgstr ""
 "Mapes_de_teclats</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Si el vostre teclat no apareix a la llista mostrada, cliqueu a "
 "<guibutton>Més </guibutton> per a obtenir la llista completa, i seleccioneu-"
 "hi el teclat."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Un cop triat el teclat al diàleg de <guibutton>Més</guibutton>, tornareu al "
 "diàleg original de selecció de teclat, i semblarà que hàgiu triat un dels "
@@ -3874,23 +4005,24 @@ msgstr ""
 "completa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Si trieu un teclat basat en caràcters no llatins, veureu una pantalla de "
 "diàleg extra que us preguntarà com preferiu alternar entre les disposicions "
 "de teclat llatines i no llatines."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Trieu l'idioma que voleu utilitzar"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3901,19 +4033,20 @@ msgstr ""
 "selecció durant la instal·lació i per al sistema instal·lat."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Si és probable que us calguin diversos idiomes instal·lats al sistema, tant "
 "per un o diversos usuaris, hauríeu d'utilitzar el botó  <guibutton>Diversos "
@@ -3921,7 +4054,7 @@ msgstr ""
 "un cop feta la instal·lació."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3930,18 +4063,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Encara que trieu més d'un idioma, n'heu de triar un com a l'idioma de "
 "preferència a la pantalla de primer idioma. També es marcarà com a "
 "seleccionat a la pantalla de diversos idiomes."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3950,20 +4084,20 @@ msgstr ""
 "és recomanable instal·lar també l'idioma del vostre teclat."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4015,63 +4149,63 @@ msgstr ""
 "botons o més."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Addició o modificació d'una entrada al menú d'arrencada"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: 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><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4080,25 +4214,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4107,50 +4243,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Ús del gestor d'arrencada de Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4159,18 +4296,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Ús d'un gestor d'arrencada existent"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "El procediment exacte per a afegir Mageia a un gestor d'arrencada ja "
 "existent està fora de l'abast d'aquesta ajuda, tot i que normalment "
@@ -4179,20 +4317,20 @@ msgstr ""
 "del sistema operatiu corresponent."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4201,140 +4339,139 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opcions"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
+"<guilabel>Contrasenya (una altra vegada)</guilabel>: torneu a escriure-hi la "
+"contrasenya i drakx comprovarà que hi hagi la mateixa contrasenya en les "
+"dues caselles."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Configuració SCSI"
 
@@ -4347,35 +4484,38 @@ msgstr "Configuració SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX acostuma a detectar correctament els discs durs. Amb alguns "
 "controladors SCSI antics, potser no és capaç de determinar correctament els "
 "controladors que cal utilitzar, i per tant no pot reconèixer el disc."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Si passa això, caldrà indicar manualment a DrakX quins són els discs SCSI."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "Llavors DrakX hauria de ser capaç de configurar els discs correctament."
@@ -4395,10 +4535,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "En aquesta pantalla es mostra el nom del controlador que l'instal·lador ha "
 "triat per a la targeta de so, que serà el predeterminat si n'hi ha un."
@@ -4421,10 +4561,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Llavors, a la pantalla de l'eina draksound o «Configuració del so», feu clic "
 "a <guibutton>Avançat</guibutton> i després a <guibutton>Solució de "
@@ -4432,16 +4574,18 @@ msgstr ""
 "problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avançat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Clicar a <guibutton>Avançat</guibutton> en aquesta pantalla durant la "
 "instal·lació és útil si no hi ha cap controlador predeterminat i n'hi ha "
@@ -4449,16 +4593,17 @@ msgstr ""
 "d'equivocat."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "En aquest cas podeu seleccionar un controlador diferent després de fer clic "
 "a <guibutton>Deixa'm triar un controlador</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmació del disc dur que es formatarà"
 
@@ -4469,28 +4614,35 @@ msgstr "Confirmació del disc dur que es formatarà"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Feu clic a <guibutton>Anterior</guibutton> si no esteu segur sobre la tria."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Feu clic a <guibutton>Següent</guibutton> si esteu segur i voleu esborrar "
 "totes les particions, tots els sistemes operatius i totes les dades del disc."
@@ -4604,54 +4756,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Desinstal·lació de Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4690,3 +4837,179 @@ 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 ""
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "A més, podeu habilitar o inhabilitar un compte de convidat."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Tot allò que un convidat, amb un compte predeterminat <emphasis>rbash</"
+#~ "emphasis>, desi al seu directori /home serà esborrat quan tanqui la "
+#~ "sessió. El convidat hauria de desar els fitxers importants en una memòria "
+#~ "USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Habilita el compte de convidat</guilabel>: aquí podeu habilitar "
+#~ "o inhabilitar el compte d'un convidat. Aquest tipus de compte permet a un "
+#~ "convidat iniciar la sessió i utilitzar el PC, però té un accés més "
+#~ "restringit que els usuaris normals."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Id. de grup</guilabel>: aquí podeu establir l'id. de grup. "
+#~ "També és un nombre, habitualment el mateix que per a l'usuari. Deixeu-ho "
+#~ "en blanc excepte si sabeu què esteu fent."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "«Dispositiu» es compon de: «unitat de disc dur», [«número d'unitat de "
+#~ "disc dur»(lletra)], «número de partició» (per exemple, «sda5»)."
+
+#~ msgid "Workstation."
+#~ msgstr "Estació de treball."
+
+#~ msgid "Server."
+#~ msgstr "Servidor."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Entorn gràfic."
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Hi ha quatre grups, feu clic sobre el triangle que hi ha abans de cada "
+#~ "grup per a expandir-lo i mostrar tots els serveis que conté."
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Si no trobeu la vostra targeta a la llista de proveïdors (perquè encara "
+#~ "no és a la base de dades o bé perquè és antiga) potser encara podeu "
+#~ "trobar un controlador adequat a la categoria Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Hi ha una pestanya per a cada disc dur o altre dispositiu "
+#~ "d'emmagatzematge detectats, com ara un llapis de memòria USB. Per "
+#~ "exemple, sda, sdb i sdc si n'hi ha tres."
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Alinea a\" \"MiB\""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "La disposició del teclat és l'americana."
+
+#~ 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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Aquí podeu ajustar el nivell de seguretat."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "Si no sabeu què triar, no toqueu les opcions predeterminades."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Mitjà de CD de només d'arrencada"
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "També podeu fer servir l'eina dd en una consola:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Desconnecteu el llapis de memòria USB, ja està"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Utilitzeu aquesta opció per a una nova instal·lació de "
+#~ "<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."
+#~ msgstr ""
+#~ "Si teniu una o més instal·lacions de <application>Mageia</application> en "
+#~ "el sistema, l'instal·lador us permetrà actualitzar-ne una a la darrera "
+#~ "versió."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
diff --git a/docs/docs/stable/installer/cs.po b/docs/docs/stable/installer/cs.po
index 286e86be..6a3bc5ab 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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/"
@@ -35,12 +35,13 @@ msgstr "Licence a poznámky k vydání"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -74,8 +75,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Chcete-li je přijmout, jednoduše vyberte <guilabel>Přijmout</guilabel> a "
@@ -98,9 +100,10 @@ msgstr "Poznámky k vydání"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Jsou dostupné důležité informace o tomto vydání <application>Mageia</"
@@ -108,13 +111,13 @@ msgstr ""
 "vydání</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "cs"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Výběr zdroje (nastavení doplňkových instalačních zdrojů)"
 
@@ -122,23 +125,25 @@ msgstr "Výběr zdroje (nastavení doplňkových instalačních zdrojů)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "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 "
@@ -146,23 +151,25 @@ msgstr ""
 "balíčků."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Pro síťové zdroje, jsou zapotřebí dva nasáledijící kroky:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "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:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "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, "
@@ -170,14 +177,15 @@ msgstr ""
 "konkrétní úložiště nebo vlastní instalaci NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "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í "
@@ -193,7 +201,7 @@ msgstr "Správa uživatele  a superuživatele"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -206,21 +214,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavení hesla správce (uživatele root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Pro všechny instalace <application>Mageii</application> se doporučuje "
 "nastavit heslo superuživatele anebo správce, které se v Linuxu obyčejně "
@@ -232,32 +240,35 @@ msgstr ""
 "neudělali překlep."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Zadejte uživatele"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "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:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -266,7 +277,7 @@ msgstr ""
 "ikona uživatele."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -275,10 +286,11 @@ msgstr ""
 "skutečné jméno uživatele."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Přihlašovací jméno</guilabel>: Zde můžete zadat uživatelské "
@@ -287,40 +299,42 @@ msgstr ""
 "velikost písmen.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Heslo (znovu)</guilabel>: Znovu zadejte do tohoto textového pole "
-"heslo uživatele a drakx zkontroluje, zda máte stejné heslo v každém z "
-"textových polí pro uživatelské heslo."
+"<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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -329,87 +343,60 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Přístupová oprávnění lze změnit také po instalaci."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Rozšířená správa uživatelů"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "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><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Dodatečně můžete zakázat anebo povolit účet hosta."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Cokoli, co si host s výchozím hostitelským účtem <emphasis>rbash</emphasis> "
-"uloží do svého /domovského (/home) adresáře, bude smazáno v okamžiku, kdy se "
-"odhlásí. Host by si měl uložit svoje důležité soubory na zařízení USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Povolit hostův účet</guilabel>: Zde můžete povolit anebo zakázat "
-"účet hosta. Hostův účet hostu dovoluje přihlásit se k vašemu počítači a "
-"používat jej, ale má více omezený přístup než normální uživatelé."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: 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:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>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:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID skupiny</guilabel>: Toto vám umožňuje nastavit ID skupiny. Též "
-"je to číslo, obyčejně to samé jako pro uživatele. Ponechejte je prázdné, "
-"pokud nevíte, co děláte."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Zvolte si přípojné body"
 
@@ -426,13 +413,14 @@ msgstr "Zvolte si přípojné body"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -442,7 +430,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -453,41 +441,45 @@ msgstr ""
 "body změnit."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "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:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "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:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Zařízení\", se skládá z \"pevného disku\", [\"číslo disku\" (písmeno)], "
-"\"číslo oddílu\" (například \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "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</"
@@ -497,20 +489,22 @@ msgstr ""
 "instalace kotle (cauldron)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Pro oddíly, ke kterým nepotřebujete mít přístup, nemusíte vyplňovat přípojný "
 "bod."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "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</"
@@ -518,7 +512,7 @@ msgstr ""
 "viděli jeho typ a velikost."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -781,8 +775,9 @@ 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 "
+"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 "
@@ -790,8 +785,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -810,14 +806,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Rozhodněte se, zda chcete používat prostředí <application>KDE</application> "
 "nebo <application>Gnome</application>. Obě prostředí jsou vybavená všemi "
@@ -844,8 +842,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -857,62 +856,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Pracovní stanice."
+#, 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
-msgid "Server."
-msgstr "Server."
+#, 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
-msgid "Graphical Environment."
-msgstr "Grafické prostředí."
+#, 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
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuální výběr balíčků: Tuto možnost můžete použít pro ruční přidání "
 "nebo odebrání balíčků."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Přečtěte si <xref linkend=\"minimal-install\"/> pro instrukce, jak provést "
 "minimální instalaci (bez nebo s X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Zde můžete přidávat nebo odebírat všechny doplňkové balíčky pro přizpůsobení "
 "instalace."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -927,45 +933,43 @@ msgstr ""
 "zvolením jeho nahrání."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Nastavení služeb"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr "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:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Jsou zde 4 skupiny. Klepnutím na šipku před skupinou danou skupinu rozbalíte "
-"a uvidíte služby, které obsahuje."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Nastavení, která DrakX vybral, jsou obyčejně dobrá."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -974,7 +978,7 @@ msgstr ""
 "níže."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Věci měňte jen tehdy, když velmi dobře víte, co děláte."
 
@@ -987,12 +991,13 @@ msgstr "Nastavení časového pásma"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1002,18 +1007,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "V dalším okně si můžete vybrat nastavení hardwarových hodin na místní čas a "
 "GMT, také známý jako UTC."
@@ -1028,23 +1035,23 @@ 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:11
+#: en/configureX_card_list.xml:13
 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:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1053,7 +1060,7 @@ msgstr ""
 "identifikuje správně."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1062,100 +1069,97 @@ msgstr ""
 "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:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "dodavatel"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "pak název vaší karty"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "a typ vaší karty"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Pokud nemůžete najít svou kartu v seznamech dodavatelů (protože ještě není v "
-"databázi, nebo je to starší karta) můžete najít vhodný ovladač v kategorii "
-"Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "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:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "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:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "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:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Bez ohledu na to, které grafické prostředí (známé i jako prostředí pracovní "
 "plochy) jste si vybrali pro tuto instalaci <application>Mageii</"
@@ -1169,7 +1173,7 @@ msgstr ""
 "myslíte, že volba je nesprávná."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1178,13 +1182,14 @@ msgstr ""
 "seznamu vaši kartu, pokud je to třeba."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Máte na výběr možnost "
 "<guilabel>Plug'n Play</guilabel>, pokud je použitelná, nebo si vybrat "
@@ -1194,30 +1199,31 @@ msgstr ""
 "vašeho monitoru."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Nesprávná obnovovací frekvence může poškodit váš monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>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:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Zkouška</guibutton></emphasis>: Ne vždy se během  "
 "instalace objeví testovací tlačítko. Pokud je tu toto tlačítko, můžete "
@@ -1229,7 +1235,7 @@ msgstr ""
 "testovací tlačítko dostupné.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1238,12 +1244,12 @@ msgstr ""
 "zda povolit nebo zakázat různé další možnosti."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Výběr monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1252,12 +1258,13 @@ msgstr ""
 "váš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Vybrání monitoru s odlišnými charakteristikami může poškodit váš "
 "monitor nebo vybavení pro video. Nezkoušejte, prosím, nic bez toho, že byste "
@@ -1265,23 +1272,23 @@ msgstr ""
 "do dokumentace k vašemu monitoru."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Vlastní</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1294,7 +1301,7 @@ msgstr ""
 "rychlost, kterou jsou zobrazovány skenované řádky."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1307,12 +1314,12 @@ msgstr ""
 "konzervativní nastavení a prověřte ho v dokumentaci k vašemu monitoru."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1320,12 +1327,12 @@ 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:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Dodavatel</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1334,28 +1341,30 @@ msgstr ""
 "můžete si ho zvolit ze stromu pomocí výběru:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "název výrobce monitoru"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "popis monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Všeobecný</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "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 "
@@ -1365,12 +1374,12 @@ msgstr ""
 "výběru konzervativní."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastní rozdělení disku pomocí DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1381,12 +1390,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "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 "
@@ -1394,42 +1405,44 @@ msgstr ""
 "literal>, jinak váš systém nebude možné zavést."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"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:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "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><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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 "
@@ -1438,32 +1451,34 @@ msgstr ""
 "nástroje jako je přidání štítku nebo vybrání typu oddílu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Pokračujte dokud jste nenastavil vše podle vašeho přání."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Klepněte na tlačítko <guibutton>Hotovo</guibutton>, když jste připraven."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1471,12 +1486,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1485,7 +1500,7 @@ msgstr ""
 "zaváděcí oddíl BIOS a že je správného typu"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1498,32 +1513,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Rozdělení disku"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "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:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "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:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1536,12 +1553,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Použít existující oddíly"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1550,12 +1567,12 @@ msgstr ""
 "kompatibilní oddíly a tyto mohou být použity pro instalaci."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Použít volné místo"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1564,12 +1581,12 @@ msgstr ""
 "využije pro novou instalaci Mageii."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Použít volné místo na oddílu Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1578,7 +1595,7 @@ msgstr ""
 "může nabídnout jeho použití."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1589,7 +1606,7 @@ msgstr ""
 "zazálohovány všechny důležité soubory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1605,12 +1622,14 @@ msgstr ""
 "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:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "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 "
@@ -1618,35 +1637,37 @@ msgstr ""
 "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:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Smazat a použít celý disk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Tato volba použije celé diskové zařízení pro Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "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:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1656,12 +1677,12 @@ msgstr ""
 "disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Vlastní rozdělení disku"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1670,65 +1691,80 @@ msgstr ""
 "(resp. discích)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: 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><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "Instalátor rozdělí dostupné místo podle následujících pravidel:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "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:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "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:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 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:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap 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:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "zbytek (přinejmenším 12/19) je přiděleno pro /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "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:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "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. "
@@ -1736,17 +1772,17 @@ msgstr ""
 "zkontrolovat, že toto bylo provedeno správně."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1757,7 +1793,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1766,15 +1802,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "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 "
@@ -1785,19 +1822,22 @@ msgstr ""
 "gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Zarovnat na\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Předcházející volné místo (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Též se ujistěte, že všechny oddíly jsou vytvořeny se sudým počtem megabajtů."
 
@@ -1807,7 +1847,7 @@ 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:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1822,18 +1862,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Oficiální dokumentace pro Mageiu"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1845,7 +1885,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1857,7 +1897,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1869,13 +1909,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1887,26 +1927,34 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalace pomocí DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Únor 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1914,7 +1962,7 @@ msgstr "Gratulujeme"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1923,7 +1971,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1933,16 +1981,17 @@ msgstr ""
 "je bezpečné vyjmout instalační médium a restartovat počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "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:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1951,12 +2000,12 @@ msgstr ""
 "vybrána a spuštěna vaše nainstalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Bavte se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1972,31 +2021,31 @@ msgstr "Firewall"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2007,20 +2056,18 @@ msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2028,7 +2075,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2038,21 +2085,21 @@ msgstr ""
 "službou."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formátování"
 
@@ -2061,14 +2108,14 @@ msgstr "Formátování"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2078,23 +2125,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Zde si můžete vybrat, který oddíl (nebo oddíly) si přejete naformátovat. "
 "Všechna data na oddílech <emphasis>neoznačených</emphasis> pro naformátování "
 "budou ušetřena."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "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:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2103,12 +2151,13 @@ msgstr ""
 "zkontrolovat na takzvané <emphasis>chybné bloky</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "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í</"
@@ -2117,7 +2166,7 @@ msgstr ""
 "na vašich oddílech."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2126,12 +2175,12 @@ msgstr ""
 "pokračování."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalátor Mageii"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2142,7 +2191,7 @@ msgstr ""
 "je to možné."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2151,148 +2200,145 @@ msgstr ""
 "spustí instalátor, který bude obyčejně mít vše, co potřebujete."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Uvítací instalační obrazovka"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Použití DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "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:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Na této obrazovce je možné nastavit některá osobní nastavení:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Jazyk (jen pro instalaci, může se odlišovat od zvoleného systémového jazyka) "
-"stisknutím klávesy F2 (jen v zastaralém režimu)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Zde je například francouzská uvítací obrazovka, když používáte živé DVD/CD. "
-"Pamatujte si, že nabídka na Live DVD/CD nepředkládá: <guilabel>Záchranný "
-"systém</guilabel>, <guilabel>Paměťový test</guilabel> a <guilabel>Nástroj na "
-"zjištění vybavení počítače</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Změňte rozlišení obrazovky stisknutím klávesy F3 (jen v zastaralém režimu)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Přidejte některé volby pro kernel stisknutím klávesy <emphasis role=\"bold"
-"\">F6</emphasis> v zastaralém režimu nebo klávesy <emphasis role=\"bold\">e</"
-"emphasis> v režimu UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- 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 ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Pokud instalace selhává, tehdy může být nutné vyzkoušet znovu jednu z "
-"možností navíc. Nabídka vyvolaná přes F6 zobrazuje nový řádek nazvaný "
-"<guilabel>Volby pro zavedení</guilabel> a nabízí čtyři položky:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Výchozí, tato nemění nic ve výchozích volbách."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Žá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><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Žá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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2301,55 +2347,52 @@ msgstr ""
 "v řádku <guilabel>Volby zavádění systému</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "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."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Přidejte více voleb pro kernel stisknutím klávesy F1 (jen v zastaralém "
-"režimu)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "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."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "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 "
@@ -2357,19 +2400,22 @@ msgstr ""
 "guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2380,80 +2426,47 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Použití drátové sítě"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Zde je výchozí uvítací obrazovka při používání instalačního CD založeného na "
-"připojení k drátové síti (obrazy netinstall.iso nebo netinstall-nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Nedovoluje změnit jazyk, dostupné možnosti jsou popsány na obrazovce. Pro "
-"více informací o používaní instalačního CD založeného na připojení k síti se "
-"podívejte na <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
-"\">Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Rozložení klávesnice je americké."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Instalační kroky"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "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:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "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><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "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:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2471,17 +2484,17 @@ msgstr ""
 "současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 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:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Bez grafického rozhraní"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2492,13 +2505,16 @@ msgstr ""
 "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:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "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í "
@@ -2507,12 +2523,12 @@ msgstr ""
 "stiskněte ENTER. Nyní pokračujte instalací v textovém režimu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instalace zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2527,14 +2543,15 @@ 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:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problém paměti RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2545,18 +2562,20 @@ msgstr ""
 "<code>mem=256M</code> by znamenalo 256 MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamické oddíly"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "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é "
@@ -2575,18 +2594,18 @@ msgstr "Aktualizace"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2596,10 +2615,11 @@ msgstr ""
 "vylepšeny."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Zvolte <guilabel>ano</guilabel>, pokud si je přejete stáhnout a "
@@ -2607,8 +2627,9 @@ msgstr ""
 "nebo pokud nejste připojeni k internetu."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Potom stiskněte <guibutton>Další</guibutton> pro pokračování"
 
 #. type: Content of: <section><info><title>
@@ -2665,18 +2686,18 @@ msgstr "Výběr zdrojů (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2688,7 +2709,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:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2697,7 +2718,7 @@ msgstr ""
 "základ distribuce."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2713,13 +2734,14 @@ msgstr ""
 "WiFi atd."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Repozitář pro <emphasis>Tainted</emphasis>, moravsky tedy poznamenaný "
 "software, obsahuje balíčky uvolněné pod svobodnou licencí. Hlavním hlediskem "
@@ -2729,38 +2751,41 @@ msgstr ""
 "komerčních video DVD, atd."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimální instalace"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "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:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "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:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "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á "
@@ -2769,9 +2794,10 @@ msgstr ""
 "Podívejte se na <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Pokud jste si zvolili tuto instalační třídu, potom vám příslušná obrazovka "
@@ -2779,16 +2805,14 @@ msgstr ""
 "dokumentace a X server."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Pokud je vybráno, tehdy je \"Spolu s X\" zahrnuto i IceWM jako lehké "
-"pracovní prostředí."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2803,15 +2827,15 @@ msgstr ""
 "\">jádrových programech GNU</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2828,11 +2852,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX 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í "
@@ -2842,8 +2867,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2858,71 +2883,74 @@ msgstr "výchozí nastavení bylo vyzkoušeno, ale selhalo"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Systémové parametry"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časové pásmo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX pro vás vybral časové pásmo, vzhledem k vašemu oblíbenému jazyku. "
 "Můžete je změnit, pokud je to potřeba. Podívejte se také na <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Země/Oblast</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Pokud nejste ve vybrané zemi, je velmi důležité, abyste opravili toto "
 "nastavení. Podívejte se na <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zavaděč</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX udělal dobré výběry pro nastavení zavaděče systému."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Pokud nevíte jak nastavit Grub2, nic neměňte"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Pro více informací se podívejte na <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Správa uživatelů</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2931,22 +2959,23 @@ msgstr ""
 "<literal>/home</literal> t. j. domácí adresáře."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Služby</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systémové služby označují tyto malé programy, které běží na pozadí (tzv. "
 "démoni, což je však zvrácené historické přirovnání). Tento nástroj vám "
 "umožňuje povolit nebo zakázat určité úlohy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2955,44 +2984,45 @@ msgstr ""
 "zabránit správnému běhu vašeho počítače."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Pro více informací se podívejte na <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Hardwarové parametry"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klávesnice</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Zde nastavujete nebo měníte rozložení vaší klávesnice, které bude záležet na "
 "vaší poloze, jazyku nebo typu klávesnice."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Myš</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3001,41 +3031,42 @@ msgstr ""
 "kulové ovladače atd."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvuková karta</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "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:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafické rozhraní</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "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:141
+#: 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:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3044,20 +3075,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parametry sítě a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Síť</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3067,21 +3099,22 @@ msgstr ""
 "(Nonfree)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Když přidáváte síťovou kartu, nezapomeňte zároveň nastavit i váš firewall na "
 "sledování onoho rozhraní."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3092,26 +3125,27 @@ msgstr ""
 "některé proxy služby."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "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:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Bezpečnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3120,17 +3154,17 @@ msgstr ""
 "výchozí nastavení (standardní) pro běžné použití přiměřené."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Zaškrtněte volbu, která se nejlépe hodí k vašemu používání."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3140,7 +3174,7 @@ msgstr ""
 "nebo ukradnout."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3151,7 +3185,7 @@ msgstr ""
 "najdete na <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Mějte na paměti, že dovolení všeho (žádný firewall) může být velmi riskantní."
@@ -3219,40 +3253,73 @@ msgstr ""
 "instalaci <application>Mageii</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílu:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Zde můžete upravit vaši úroveň bezpečnosti."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Pokročilé</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"Ponechejte výchozí nastavení jak jsou, pokud nevíte, co si máte vybrat."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "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."
@@ -3269,25 +3336,27 @@ msgstr "Úvod"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia je šířena cestou obrazů ISO. Tato stránka vám pomůže vybrat, který "
 "obraz vyhovuje vašim potřebám."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Jsou tu dvě rodiny nosičů:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "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 "
@@ -3296,81 +3365,85 @@ msgstr ""
 "nainstalujete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"ŽIVÝ nosič dat: Můžete zavést nosič ve skutečném systému Mageia bez jeho "
-"instalace, abyste viděli, co dostanete po instalaci. Proces instalace je "
-"jednodušší, ale dostanete méně možností výběru."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Podrobnosti jsou uvedeny v dalších částech."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definice"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "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:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Můžete je najít <link ns4:href=\"http://www.mageia.org/en/downloads/\">zde</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klasické instalační nosiče"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Běžné vlastnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Tyto soubory ISO používají tradiční instalátor nazvaný drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr "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:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Různé nosiče pro 32 nebo 64 bitové architektury."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3379,113 +3452,118 @@ msgstr ""
 "paměťový test, nástroj na zjištění hardware."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "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:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "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:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Živé nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "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:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 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:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Ž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><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Obsahují nesvobodný software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Živé DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Pouze KDE Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Všechny jazyky jsou přítomny."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Pouze 64 bitová architektura."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 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:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Živé DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Pouze Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 nebo 64 bitová architektura."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Jen zaváděcí nosiče CD"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3497,28 +3575,30 @@ msgstr ""
 "anebo na internetu."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Jen anglický jazyk."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3552,11 +3632,12 @@ msgstr "Stažení"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "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 "
@@ -3570,10 +3651,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum a sha1sum jsou nástroje ke zkontrolování neporušenosti souboru ISO. "
 "Jeden z nich si ponechejte <link linkend=\"integrity\">pro budoucí použití</"
@@ -3586,8 +3668,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Zaškrtněte přepínací tlačítko Uložit soubor."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3595,14 +3677,15 @@ 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:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "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í "
@@ -3612,69 +3695,84 @@ msgstr ""
 "nebo pokusit o opravu pomocí BitTorrentu."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Otevřete konzoli, netřeba být superuživatelem (root), a:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- pro použití md5sum, napište: [sam@localhost]$ <userinput>md5sum cesta/k/"
 "obrazovému/souboru.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- 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:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"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><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"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:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Vypálení nebo vepsání souboru ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "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:234
+#: en/SelectAndUseISOs2.xml:242
 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:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "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 "
@@ -3683,12 +3781,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Zapsat ISO na USB flash"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3698,18 +3796,19 @@ msgstr ""
 "systému."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3718,12 +3817,12 @@ msgstr ""
 "naformátovat ho."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 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:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3732,73 +3831,72 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Použitím grafického nástroje ve Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Můžete vyzkoušet:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=sk_SK\">Rufus</link> "
 "použitím volby \"obraz ISO\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Použitím příkazového řádku v systému GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Je potenciálně \"nebezpečné\"  dělat to ručně. Riskujete, že přepíšete "
 "diskový oddíl, zadáte-li nesprávně ID zařízení."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Též můžete použít nástroj dd v konzoli:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Otevřete konzoli"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "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:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3808,28 +3906,40 @@ msgstr ""
 "zpřístupnit nebo z něho číst)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Použijte příkaz <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"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
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "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><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3871,46 +3981,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"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."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "kde X=název vašeho zařízení, např. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Vložte příkaz: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Odpojte vaše zařízení USB. Je hotovo."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3940,19 +4059,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Pokud je vaše země jen v seznamu <guilabel>ostatních zemí</guilabel>, po "
@@ -3961,18 +4082,19 @@ msgstr ""
 "volbu."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Vstupní metoda"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Na obrazovce <guilabel>Ostatní země</guilabel> si též můžete zvolit vstupní "
@@ -3986,11 +4108,13 @@ msgstr ""
 "balíčků."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "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áš "
@@ -3998,55 +4122,54 @@ msgstr ""
 "(správce root)."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalace nebo aktualizace"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalace"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Použijte tuto volbu pro čerstvou instalaci <application>Mageii</application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Aktualizace"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Pokud máte v systému jednu nebo více instalací <application>Mageii</"
-"application>, instalátor vám dovolí aktualizovat jednu z nich na nejnovější "
-"vydání."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "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 "
@@ -4056,16 +4179,17 @@ msgstr ""
 "home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "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ž "
@@ -4077,12 +4201,14 @@ msgstr ""
 "Potom současně stiskněte <guilabel>Alt+Ctrl+Delete</guilabel> pro restart."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "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 "
@@ -4117,12 +4243,12 @@ msgstr ""
 "časové oblasti."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klávesnice"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4131,16 +4257,17 @@ msgstr ""
 "vhodná klávesnice, bude jako výchozí použito rozložení klávesnice US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4158,23 +4285,25 @@ msgstr ""
 "Rozložení_kláves</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "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 "
@@ -4183,23 +4312,24 @@ msgstr ""
 "plného seznamu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Pokud jste si vybrali klávesnici založenou na nelatinských znacích, uvidíte "
 "další dialogovou obrazovku ptající se, jak byste chtěli přepínat mezi "
 "latinským a nelatinským rozložením klávesnice."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 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:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4210,19 +4340,20 @@ msgstr ""
 "instalace a pro váš instalovaný systém."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Je možné, že budete potřebovat mít ve vašem systému nainstalováno více "
 "jazyků, pro sebe nebo pro ostatní uživatele, potom byste měli použít "
@@ -4230,7 +4361,7 @@ msgstr ""
 "náročné přidat další jazykovou podporu po instalaci."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4243,18 +4374,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "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:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4263,23 +4395,24 @@ msgstr ""
 "potom se doporučuje nainstalovat stejně tak jazyk vaší klávesnice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia používá jako výchozí podporu pro UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "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:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4334,66 +4467,69 @@ msgstr ""
 "více tlačítek."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Přidaní nebo změna položky v nabídce zavaděče"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "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/setupBootloader.xml:9
+#: 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:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Rozhraní zavaděče"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: 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:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi pro UEFI systémy."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: 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:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 na systémech Legacy/MBR a Legacy/GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4406,27 +4542,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co děláte."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi na UEFI systémech"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "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:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4439,14 +4580,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Pokud je Mageia jediným systémem nainstalovaným na váš počítač, instalátor "
@@ -4458,38 +4600,41 @@ msgstr ""
 "systémů, které máte v počítači."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Použití zavaděče Mageii"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Ve výchozím nastavení, podle systému, zapíše Mageia nový:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi zavaděč do ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4502,18 +4647,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Použití už existujícího zavaděče"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "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 "
@@ -4522,20 +4668,20 @@ msgstr ""
 "systému, o nějž jde."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4548,7 +4694,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4557,7 +4703,7 @@ msgstr ""
 "<guibutton>OK</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4566,106 +4712,103 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Volby"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "První strana"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr "<guilabel>Heslo</guilabel>: Do tohoto textového pole vložíte heslo"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Heslo (znovu)</guilabel>: Znovu zadejte heslo a drakx zkontroluje, "
 "zda odpovídá heslu zadanému výše."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Pokročilé</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Další strana"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4674,22 +4817,22 @@ msgstr ""
 "\"setupMageiaBootloader\">Používat Mageiin zavaděč</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Nastavení SCSI"
 
@@ -4702,35 +4845,38 @@ msgstr "Nastavení SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX obvykle zjistí pevné disky správně. U některých starších řadičů SCSI "
 "může být schopen určit a použít správné ovladače, ale následně nedokáže "
 "rozpoznat disk."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Pokud k tomuto dojde, budete muset ručně říci Drakx, jaký disk(y) SCSI máte."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX by pak měl být schopen správně nastavit disk(y)."
 
@@ -4751,10 +4897,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "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 "
@@ -4777,26 +4923,30 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "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:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Rozšíření"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "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 "
@@ -4804,16 +4954,17 @@ msgstr ""
 "ovladač."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "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:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrzení naformátování pevného disku"
 
@@ -4824,13 +4975,13 @@ msgstr "Potvrzení naformátování pevného disku"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4840,18 +4991,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klepněte na <guibutton>Předchozí</guibutton>, pokud si nejste jistí vaší "
 "volbou."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "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 "
@@ -4978,44 +5132,42 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Odinstalování Mageii"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Jak na to"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Pokud vás Mageia nepřesvědčila, nebo ji nemůžete správně nainstalovat, "
 "zkrátka pokud se jí chcete zbavit. Je to vaše právo a Mageia vám dává i "
 "možnost odinstalování. Toto neplatí u každého operačního systému."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "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 "
 "dalším zavedení budete mít jen Windows bez možnosti volby vašeho operačního "
 "systému."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "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 "
@@ -5025,8 +5177,8 @@ msgstr ""
 "Klepněte pravým tlačítkem na tyto oddíly a zvolte <guibutton>Smazat</"
 "guibutton>. Prostor bude uvolněn."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5034,14 +5186,15 @@ 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><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Pokud máte Windows Vista nebo Windows 7, máte o jednu možnost víc, můžete "
 "rozšířit existující oddíl, který je vlevo od volného místa. Jsou i jiné "
@@ -5093,3 +5246,333 @@ msgid ""
 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 ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Heslo (znovu)</guilabel>: Znovu zadejte do tohoto textového "
+#~ "pole heslo uživatele a drakx zkontroluje, zda máte stejné heslo v každém "
+#~ "z textových polí pro uživatelské heslo."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Dodatečně můžete zakázat anebo povolit účet hosta."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Cokoli, co si host s výchozím hostitelským účtem <emphasis>rbash</"
+#~ "emphasis> uloží do svého /domovského (/home) adresáře, bude smazáno v "
+#~ "okamžiku, kdy se odhlásí. Host by si měl uložit svoje důležité soubory na "
+#~ "zařízení USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Povolit hostův účet</guilabel>: Zde můžete povolit anebo "
+#~ "zakázat účet hosta. Hostův účet hostu dovoluje přihlásit se k vašemu "
+#~ "počítači a používat jej, ale má více omezený přístup než normální "
+#~ "uživatelé."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID skupiny</guilabel>: Toto vám umožňuje nastavit ID skupiny. "
+#~ "Též je to číslo, obyčejně to samé jako pro uživatele. Ponechejte je "
+#~ "prázdné, pokud nevíte, co děláte."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Zařízení\", se skládá z \"pevného disku\", [\"číslo disku\" (písmeno)], "
+#~ "\"číslo oddílu\" (například \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Pracovní stanice."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafické prostředí."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Jsou zde 4 skupiny. Klepnutím na šipku před skupinou danou skupinu "
+#~ "rozbalíte a uvidíte služby, které obsahuje."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Pokud nemůžete najít svou kartu v seznamech dodavatelů (protože ještě "
+#~ "není v databázi, nebo je to starší karta) můžete najít vhodný ovladač v "
+#~ "kategorii Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "Instalátor rozdělí dostupné místo podle následujících pravidel:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Zarovnat na\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Předcházející volné místo (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Na této obrazovce je možné nastavit některá osobní nastavení:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Jazyk (jen pro instalaci, může se odlišovat od zvoleného systémového "
+#~ "jazyka) stisknutím klávesy F2 (jen v zastaralém režimu)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Zde je například francouzská uvítací obrazovka, když používáte živé DVD/"
+#~ "CD. Pamatujte si, že nabídka na Live DVD/CD nepředkládá: "
+#~ "<guilabel>Záchranný systém</guilabel>, <guilabel>Paměťový test</guilabel> "
+#~ "a <guilabel>Nástroj na zjištění vybavení počítače</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Přidejte některé volby pro kernel stisknutím klávesy <emphasis role=\"bold"
+#~ "\">F6</emphasis> v zastaralém režimu nebo klávesy <emphasis role=\"bold"
+#~ "\">e</emphasis> v režimu UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Pokud instalace selhává, tehdy může být nutné vyzkoušet znovu jednu z "
+#~ "možností navíc. Nabídka vyvolaná přes F6 zobrazuje nový řádek nazvaný "
+#~ "<guilabel>Volby pro zavedení</guilabel> a nabízí čtyři položky:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Přidejte více voleb pro kernel stisknutím klávesy F1 (jen v zastaralém "
+#~ "režimu)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Použití drátové sítě"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Zde je výchozí uvítací obrazovka při používání instalačního CD založeného "
+#~ "na připojení k drátové síti (obrazy netinstall.iso nebo netinstall-"
+#~ "nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Nedovoluje změnit jazyk, dostupné možnosti jsou popsány na obrazovce. Pro "
+#~ "více informací o používaní instalačního CD založeného na připojení k síti "
+#~ "se podívejte na <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+#~ "iso_install\">Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Rozložení klávesnice je americké."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Pokud je vybráno, tehdy je \"Spolu s X\" zahrnuto i IceWM jako lehké "
+#~ "pracovní prostředí."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Zde můžete upravit vaši úroveň bezpečnosti."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Ponechejte výchozí nastavení jak jsou, pokud nevíte, co si máte vybrat."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "ŽIVÝ nosič dat: Můžete zavést nosič ve skutečném systému Mageia bez jeho "
+#~ "instalace, abyste viděli, co dostanete po instalaci. Proces instalace je "
+#~ "jednodušší, ale dostanete méně možností výběru."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Jen zaváděcí nosiče CD"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Zaškrtněte přepínací tlačítko Uložit soubor."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Též můžete použít nástroj dd v konzoli:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Odpojte vaše zařízení USB. Je hotovo."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "Pokud máte v systému jednu nebo více instalací <application>Mageii</"
+#~ "application>, instalátor vám dovolí aktualizovat jednu z nich na "
+#~ "nejnovější vydání."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Jak na to"
diff --git a/docs/docs/stable/installer/de.po b/docs/docs/stable/installer/de.po
index 3584ebb1..2b02809b 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-28 12:21+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -40,12 +40,13 @@ msgstr "Lizenz- und Veröffentlichungshinweise"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -79,8 +80,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Um dies zu akzeptieren, klicken Sie einfach auf <emphasis role=\"bold"
@@ -104,9 +106,10 @@ msgstr "Veröffentlichungshinweise"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Sie erhalten dort wichtige Informationen über diese <application>Mageia</"
@@ -114,13 +117,13 @@ msgstr ""
 "die <guibutton>Versionshinweise</guibutton> Schaltfläche klicken."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "de"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Medienauswahl (konfigurieren von zusätzlichen Installationsmedien)"
 
@@ -128,23 +131,25 @@ msgstr "Medienauswahl (konfigurieren von zusätzlichen Installationsmedien)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Dieser Bildschirm zeigt alle bereits erkannten Medien. Sie können andere "
 "Quellen für das Runterladen von Paketen auswählen, wie optische Laufwerke "
@@ -152,25 +157,27 @@ msgstr ""
 "nächsten Schritte zur Verfügung stehen."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Für die Netzwerkquellen müssen zwei Schritte beachtet werden:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr ""
 "Auswählen und Aktivieren der Netzwerkverbindung, falls sie noch nicht "
 "hergestellt ist"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Auswählen eines Servers oder die URL angeben (der allerste Eintrag). Durch "
 "die Auswahl eines Servers haben Sie die Auswahl aller verfügbaren Quellen, "
@@ -178,14 +185,15 @@ msgstr ""
 "können Sie eine bestimmte Quelle oder ihre eigene NFS Installation auswählen."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Falls Sie eine 64-Bit Installation aktualisieren welche womöglich einige 32-"
 "Bit Pakete enthält, wird empfohlen in diesem Bildschirm die Online-"
@@ -202,7 +210,7 @@ msgstr "Verwaltung des Benutzers und des Superusers"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -215,21 +223,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Setzen des Administrator (root)  Passworts:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Dies ist für alle Installationen von <application>Mageia</application> "
 "verfügbar, um ein Passwort für den Superuser oder Administrator zu setzen, "
@@ -243,9 +251,10 @@ msgstr ""
 "vertippt haben."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Alle Passwörter beachten die Groß-/Kleinschreibung, so dass es am besten "
@@ -253,16 +262,18 @@ msgstr ""
 "Sonderzeichen in einem Passwort verwenden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Einen Benutzer eingeben"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Hier fügen Sie einen Benutzer hinzu. Ein Benutzer hat weniger Rechte als der "
 "Superuser (root), aber genügend, um im Internet zu surfen, Büroanwendungen "
@@ -270,7 +281,7 @@ msgstr ""
 "einem Computer macht."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -279,7 +290,7 @@ msgstr ""
 "sich das Symbol für den Benutzer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -288,10 +299,11 @@ msgstr ""
 "wirklichen Namen des Benutzers ein."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Anmeldename</guilabel>: Hier geben Sie den Anmeldenamen des "
@@ -300,41 +312,42 @@ msgstr ""
 "Anmeldename beachtet die Groß-/Kleinschreibung</emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Passwort (wiederholen)</guilabel>: Geben Sie wiederum das Passwort "
-"des Benutzers in diese Textbox ein, und <emphasis role=\"bold\">drakx</"
-"emphasis> überprüft auf Übereinstimmung der beiden Passwörter für den "
-"Benutzer in den beiden Textboxen."
+"<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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -344,72 +357,47 @@ msgstr ""
 "emphasis> aus."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Die Zugriffsrechte können auch nach der Installation abgeändert werden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Fortgeschrittene Benutzerverwaltung"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "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><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Zudem können Sie einen Gastzugang aktivieren oder deaktivieren."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Jedes Gast-Benutzerkonto, das mit einem vorgegebenen <emphasis>rbash</"
-"emphasis>-Gastzugang und im Ordner <emphasis>/home</emphasis> gespeichert "
-"ist, wird gelöscht, wenn sich der Gast abmeldet. Der Gast sollte daher seine "
-"wichtigen Daten auf einen USB-Stick sichern."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Gast-Benutzerkonto</guilabel>: Hier können Sie das Gast-"
-"Benutzerkonto aktivieren oder deaktivieren. Das Gast- Benutzerkonto erlaubt "
-"es einem Gast, sich am System anzumelden und den PC zu verwenden. Dieser "
-"Gast hat aber eingeschränktere Rechte als ein normaler Benutzer."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: Diese aufklappbare Liste erlaubt es Ihnen, die "
 "Shell zu ändern, die der Benutzer verwendet, den Sie am Bildschirm zuvor "
 "hinzugefügt haben. Zur Auswahl stehen Bash, Dash und Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Benutzer-ID</guilabel>: Hier können Sie eine Benutzer-ID "
 "(Benutzeridentifikation) für den Benutzer setzen, den Sie am Bildschirm "
@@ -417,18 +405,14 @@ msgstr ""
 "solange leer, bis Sie wissen, was Sie tun."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Gruppen-ID</guilabel>: Dies ermöglicht Ihnen das Setzen einer "
-"Gruppen-ID. Ebenfalls eine Zahl, normalerweise die gleiche Zahl wie für den "
-"Benutzer. Lassen Sie diese Eingabe solange leer, bis Sie wissen was Sie tun."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Einhängepunkte wählen"
 
@@ -445,13 +429,14 @@ msgstr "Einhängepunkte wählen"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -461,7 +446,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -472,41 +457,45 @@ msgstr ""
 "zufrieden sind, können Sie die Einhängepunkte ändern."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Falls Sie etwas ändern, stellen Sie sicher, dass Sie noch eine <literal>/</"
 "literal> (root)-Partition haben."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Jede Partition wird wie folgt angezeigt: \"Gerät\" (\"Kapazität\", "
 "\"Einhängepunkt\", \"Typ\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Gerät\", ist gegliedert in: \"Festplatte\", [\"Festplattennummer\"(Zahl)], "
-"\"Partitionsnummer\" (z.B. \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Falls Sie viele Partitionen angelegt haben, können Sie verschiedene "
 "Einhängepunkte aus dem Ausklappmenü auswählen, wie z.B.  <literal>/</"
@@ -516,20 +505,22 @@ msgstr ""
 "home</literal> Partition einer Cauldron-Installation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Falls Sie keinen Zugriff auf eine Partition benötigen, lassen Sie einfach "
 "das Feld für den Einhängepunkt leer."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Falls Sie nicht sicher sind, was auszuwählen ist, klicken Sie auf "
 "<guibutton>Zurück</guibutton> und danach auf <guilabel>Benutzerdefinierte "
@@ -537,7 +528,7 @@ msgstr ""
 "Partition und schon können Sie deren Typ und Größe sehen."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -814,8 +805,9 @@ msgstr "Desktopauswahl"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Je nachdem, welche Auswahl Sie hier treffen, werden weitere Auswahlfenster "
@@ -823,8 +815,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -843,14 +836,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Wählen Sie hier Ihre bevorzugte Desktop-Umgebung <application>KDE</"
 "application> oder <application>Gnome</application>. Beide bieten einen "
@@ -878,8 +873,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -892,62 +888,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Workstation"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafische Umgebung"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuelle Paketauswahl: Um händisch Pakete hinzuzufügen oder entfernen zu "
 "können, wählen Sie bitte diese Option."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lese <xref linkend=\"minimal-install\"/> für eine Anleitung, wie man eine "
 "minimale Installation durchführt (ohne oder mit X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"  <imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Hier können Sie weitere Pakete aus- oder abwählen, um Ihre Installation "
 "anzupassen."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -964,49 +967,47 @@ msgstr ""
 "diese gesicherte Auswahldatei laden."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfigurieren Ihrer Dienste"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "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:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Sie finden hier vier Gruppen. Klicken Sie auf das Dreieck vor einer Gruppe, "
-"um alle Dienste zu sehen, die von dieser Gruppe bereitgestellt werden."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr ""
 "Normalerweise wählt <emphasis role=\"bold\">DrakX</emphasis> passende "
 "Einstellungen."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -1015,7 +1016,7 @@ msgstr ""
 "einige Informationen zu diesem Dienst angezeigt."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Ändern Sie diese Einstellungen nur dann, wenn Sie genau wissen, was Sie tun."
@@ -1029,12 +1030,13 @@ msgstr "Konfiguration der Zeitzone"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1044,18 +1046,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Im nächsten Bildschirm können Sie wählen, ob ihre Hardware-Uhr auf lokale "
 "Zeit oder auf GMT, auch als UTC bekannt, gesetzt wird."
@@ -1070,23 +1074,23 @@ msgstr ""
 "alle Betriebssysteme entweder auf Lokalzeit oder auf UTC/GMT gesetzt sind."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Einen X-Server auswählen (Ihre Grafikkarte einrichten)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1095,7 +1099,7 @@ msgstr ""
 "Ihre Grafikkarte korrekt erkennen."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1105,37 +1109,30 @@ msgstr ""
 "auswählen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "Hersteller"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "Der Name der Karte"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "Der Typ der Karte"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Falls Sie Ihre Karte nicht in der Herstellerliste finden, weil sie sich "
-"nicht in der Datenbank befindet oder weil es sich um eine ältere Karte "
-"handelt, könnten Sie einen passenden Treiber in Xorg finden."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Die Xorg-Liste enthält mehr als 40 generische und quelloffene Treiber für "
 "Grafikkarten. Falls Sie noch immer keinen passenden Treiber für Ihre Karte "
@@ -1143,10 +1140,11 @@ msgstr ""
 "Funktionalität bietet."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Denken Sie daran, dass es durch Auswahl eines inkompatiblen Treibers "
 "passieren kann, dass Sie lediglich Zugriff auf eine "
@@ -1154,54 +1152,57 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Einige Grafikkartenhersteller bieten proprietäre Treiber für Linux an, "
 "welche nur in den \"Nonfree\"-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:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Die \"Nonfree\"-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:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Egal, welche grafische Umgebung (auch als Desktop bekannt) Sie für die "
 "Installation von <application>Mageia</application> wählen, diese basieren "
@@ -1215,7 +1216,7 @@ msgstr ""
 "glauben, dass die Auswahl nicht korrekt ist."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1224,13 +1225,14 @@ msgstr ""
 "Karte aus der Liste, wenn nötig."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Bildschirm</guibutton></emphasis>: Sie können "
 "<guilabel>Plug'n Play</guilabel> wählen, falls verfügbar, oder Ihren "
@@ -1241,30 +1243,31 @@ msgstr ""
 "einzustellen."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Falsche Wiederholfrequenzen können Ihren Bildschirm beschädigen"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>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:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Der Test-Knopf ist während "
 "der Installation nicht immer sichtbar. Ist der Knopf sichtbar, so können Sie "
@@ -1278,7 +1281,7 @@ msgstr ""
 "Bildschirms befinden, wenn der Knopf nicht verfügbar ist.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1287,12 +1290,12 @@ msgstr ""
 "verschiedene Optionen aktivieren oder deaktivieren."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Auswahl des Monitors"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1301,12 +1304,13 @@ msgstr ""
 "normalerweise ihren Monitor korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis> Die Auswahl eines Monitors mit falschen Charakteristika kann "
 "Ihren Monitor oder Ihre Grafikkarte beschädigen. Bitte stellen Sie sicher, "
@@ -1314,23 +1318,23 @@ msgstr ""
 "bitte in die Dokumentation des Monitors"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Benutzerdefiniert</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1344,7 +1348,7 @@ msgstr ""
 "Scanlinien dargestellt werden."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1357,12 +1361,12 @@ msgstr ""
 "niedrigere Einstellung und schauen Sie in die Dokumentation ihres Monitors."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1371,12 +1375,12 @@ msgstr ""
 "Datenbank zu bestimmen"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Hersteller</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1386,28 +1390,30 @@ msgstr ""
 "anhand folgender Optionen auswählen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "Monitorbezeichnung"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "Monitorbeschreibung"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generisch</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Die Auswahl dieser Gruppe zeigt rund 30 Anzeigeneinstellungen wie 1024x768 @ "
 "60Hz und beinhaltet auch Flachbildschirme, die in Laptops verbaut sind. Die "
@@ -1416,12 +1422,12 @@ msgstr ""
 "Nochmal: es ist besser eher zu niedrige Einstellungen zu wählen."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1432,12 +1438,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Wünschen Sie auf Ihrer / -Partition (Wurzelverzeichnis) eine "
 "Verschlüsselung, müssen Sie sicherstellen, dass Sie eine eigene <literal>/"
@@ -1446,11 +1454,12 @@ msgstr ""
 "emphasis> gesetzt werden, da sonst das System nicht gebootet werden kann."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Passen Sie hier das Layout ihres Datenträger an. Sie können Partitionen "
 "entfernen oder erstellen, das Dateisystem einer Partition ändern oder die "
@@ -1458,32 +1467,32 @@ msgstr ""
 "anfangen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Dies ist der Reiter für jedes entdeckte Laufwerk oder Speichermedium, wie "
-"einem USB-Stick. So z.B.  <emphasis>sda</emphasis>, <emphasis>sdb</emphasis> "
-"und <emphasis>sdc</emphasis>, wenn drei Laufwerke gefunden wurden."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Wählen Sie <guibutton>Alles löschen</guibutton>, um alle Partitionen des "
 "gewählten Laufwerks zu löschen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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 "
@@ -1494,34 +1503,36 @@ msgstr ""
 "festzulegen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 "Wiederholen Sie diesen Vorgang für alle Laufwerke, bis alle Einstellungen "
 "Ihren Wünschen entsprechen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1529,12 +1540,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1544,7 +1555,7 @@ msgstr ""
 "hat"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1557,32 +1568,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitionierung"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "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:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Die in der Liste verfügbaren Optionen variieren abhängig von Ihren verbauten "
 "Festplatte(n)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1595,12 +1608,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Verwende vorhandene Partitionen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1609,12 +1622,12 @@ msgstr ""
 "Partitionen gefunden und können für die Installation genutzt werden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Nutze freien Speicherplatz"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1623,12 +1636,12 @@ msgstr ""
 "dann wird diese Option diesen für die neue Mageia-Installation verwenden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Nutze den freien Speicherplatz einer Windows Partition"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1637,7 +1650,7 @@ msgstr ""
 "Partition verfügbar haben, kann der Installer diesen zur Nutzung vorschlagen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1649,7 +1662,7 @@ msgstr ""
 "Datenträger gesichert sind."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1667,12 +1680,14 @@ msgstr ""
 "die persönlichen Daten vor dem Vorgang zu sichern."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Bei dieser Option stellt das Installationsprogramm die verbleibende Windows-"
 "Partition in einem hellen und die zukünftige Mageia-Partition in einem "
@@ -1682,37 +1697,39 @@ msgstr ""
 "dazu den Screenshot unten."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Komplette Platte löschen und freien Platz benutzen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Diese Option wird das vollständige Laufwerk für Mageia nutzen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "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:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1723,12 +1740,12 @@ msgstr ""
 "dürfen, dann nutzen Sie bitte nicht diese Option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Benutzerdefinierte Partitionierung"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1737,71 +1754,84 @@ msgstr ""
 "Installation auf den Festplatten."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Der Installer wird den verfügbaren Speicherplatz anhand der folgenden Regeln "
-"aufteilen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Wenn der gesamte verfügbare Speicherplatz niedriger als 50 GB ist, wird nur "
 "eine Partition für / erstellt und keine separate Partition für /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Wenn der gesamte verfügbare Speicherplatz über 50 GB ist, werden drei "
 "Partitionen erstellt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 des gesamten freien Speicherplatz wird / zugewiesen, mit einer "
 "maximalen Größe von 50 GB "
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 wird swap zugewiesen mit einer maximalen Größe von 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "der Rest (die übrigen 12/19) wird /home zugewiesen."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Dies bedeutet das bei einem freien Speicherplatz von 160 GB und mehr, der "
 "Installer drei Partitionen erstellen wird: 50 GB für /, 4 GB für swap und "
 "der Rest für /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Wenn Sie ein UEFI System nutzen, wird die ESP (EFI System Partition) "
 "automatisch erkannt oder erstellt, falls diese noch nicht vorhanden ist, und "
@@ -1810,13 +1840,14 @@ msgstr ""
 "durchgeführt wurde."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT-"
 "Laufwerk verwenden, müssen Sie eine BIOS Bootpartition erstellen, falls noch "
@@ -1826,7 +1857,7 @@ msgstr ""
 "Bootpartition aus."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1837,7 +1868,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1846,15 +1877,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Einige neuere Laufwerke nutzen logische Sektoren mit 4.096 Bytes anstelle "
 "der bisherigen 512 Bytes. Aufgrund fehlender Hardware wurde das "
@@ -1865,19 +1897,22 @@ msgstr ""
 "folgende Einstellungen zu partitionieren:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Ausrichten an:\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Vorhergehender freier Speicherplatz (MiB):\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Stellen Sie außerdem sicher, dass alle Partitionen mit einer geraden Anzahl "
 "an Megabytes erstellt werden."
@@ -1888,7 +1923,7 @@ msgid "Installation from LIVE medium"
 msgstr "Installation vom LIVE Medium"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1903,18 +1938,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Die offizielle Mageia-Dokumentation"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1926,7 +1961,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1938,7 +1973,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1951,13 +1986,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1970,26 +2005,34 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation mit Hilfe von DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februar 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1997,7 +2040,7 @@ msgstr "Herzlichen Glückwunsch!"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -2006,7 +2049,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -2017,17 +2060,18 @@ msgstr ""
 "Computer neu starten können."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "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:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2036,12 +2080,12 @@ msgstr ""
 "von Ihnen installierte Mageia automatisch gewählt und gestartet."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Viel Vergnügen!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2056,11 +2100,12 @@ msgstr "Firewall"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "In diesem Abschnitt können einige einfache Firewall Regeln konfiguriert "
 "werden: diese legen fest, welche Art von Nachrichten aus dem Internet auf "
@@ -2069,15 +2114,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Als Voreinstellung ist keine Checkbox markiert - kein Systemdienst ist aus "
 "dem Netzwerk erreichbar. Die \"<emphasis>Alles (Keine Firewall)</emphasis>\" "
@@ -2091,10 +2137,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Alle weitere Checkbuttons sind mehr oder weniger selbsterklärend. Als "
 "Beispiel wählen Sie den \"CUPS Server\" aus, falls Sie möchten, dass an "
@@ -2108,12 +2155,11 @@ msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "Die angebotenen Auswahl-Schaltflächen decken nur die am meisten verwendeten "
 "Dienste ab. Mit der Schaltfläche  \"Fortgeschritten\" können Nachrichten "
@@ -2123,12 +2169,12 @@ msgstr ""
 "mehrerer Einträge (getrennt durch Leerzeichen) aktiviert werden können.  "
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2139,7 +2185,7 @@ msgstr ""
 "Dienst), wie dieser von <emphasis>RFC-433</emphasis> vorgegeben ist;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2149,7 +2195,7 @@ msgstr ""
 "Dienst verwendet wird."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2158,7 +2204,7 @@ msgstr ""
 "dementsprechend <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2167,7 +2213,7 @@ msgstr ""
 "spezifizieren Sie 2 Einträge für den selben Port."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatieren"
 
@@ -2176,14 +2222,14 @@ msgstr "Formatieren"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2193,24 +2239,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Hier können Sie wählen, welche Partition(en) formatiert werden soll(en). "
 "Alle Daten auf Partitionen, die <emphasis role=\"bold\">nicht</emphasis> für "
 "das Formatieren markiert sind, werden nicht angetastet."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Normalerweise wählt DrakX zumindest die Partitionen aus, die "
 "notwendigerweise formatiert werden müssen."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2221,12 +2268,13 @@ msgstr ""
 "möchten."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Sind Sie sich nicht sicher, die richtige Auswahl getroffen zu haben, so "
 "klicken Sie auf <guibutton><replaceable>Abbrechen</replaceable></guibutton>, "
@@ -2237,7 +2285,7 @@ msgstr ""
 "können Sie sehen, welche Daten sich auf diesen Partitionen befinden."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2246,12 +2294,12 @@ msgstr ""
 "guibutton>, um mit der Installation fortzufahren."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, das Mageia Installationsprogramm"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2262,7 +2310,7 @@ msgstr ""
 "Installation oder eine Aktualisierung so leicht wie möglich macht."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2272,37 +2320,41 @@ msgstr ""
 "Sie tun müssen."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Willkommensbildschirm der Installation"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Eine Mageia DVD verwenden"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "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:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "In diesem Bildschirm können Sie auf die Optionen zugreifen, indem Sie den "
 "Buchstaben \"e\" drücken, um in den \"Bearbeitungsmodus\" zu kommen. Um "
@@ -2312,122 +2364,113 @@ msgstr ""
 "Vorgang zu beenden."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"Von diesem Fenster aus, ist es möglich, einige persönliche Einstellungen "
-"vorzunehmen:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Die Sprache (nur für die Installation, diese kann eine andere als die für "
-"das System sein) durch drücken der F2 Taste (nur im Legacy Modus)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+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 "
 "Enter Taste."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Hier sehen Sie z.B. den französischen Willkommensbildschirm wenn eine Live "
-"DVD/CD verwendet wird. Beachte dass das Live DVD/CD Menü nicht die Auswahl "
-"<guilabel>Rettungssystem</guilabel>, <guilabel>Speichertest</guilabel> und "
-"<guilabel>Hardware-Erkennungswerkzeug</guilabel> enthält."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Ändere die Bildschirmauflösung durch drücken der F3 Taste (nur im Legacy "
 "Modus)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Fügen Sie durch Drücken der Taste <emphasis role=\"bold\">F6</emphasis> im "
-"alten Modus oder der Taste <emphasis role=\"bold\">e</emphasis> im UEFI-"
-"Modus einige Kernel-Optionen hinzu."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Standard, es ändert nichts an den Standardoptionen."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Wenn die Installation fehlschlägt, ist es eventuell notwendig dies erneut "
-"mit extra Optionen zu probieren. Das Menü zeigt durch drücken den F6 Taste "
-"eine neue Zeile, welche <guilabel>Boot-Optionen</guilabel> heißt und vier "
-"Einträge enthält:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Standard, es ändert nichts an den Standardoptionen."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), die "
 "Stromsparfunktion wird nicht berücksichtigt."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Kein lokales APIC (Local Advanced Programmable Interrupt Controller), es "
 "geht um die CPU Unterbrechung, wähle die Option wenn Sie danach gefragt "
 "werden."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2436,11 +2479,12 @@ msgstr ""
 "in der <guilabel>Bootoptionen</guilabel> Zeile geändert."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Bei einigen Mageia Veröffentlichungen kann es passieren, das die Einträge "
 "welche mit der F6 Taste ausgewählt wurden, nicht in der "
@@ -2448,25 +2492,20 @@ msgstr ""
 "trotzdem befolgt."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Fügen Sie weitere Kerneloptionen hinzu indem Sie die F1 Taste drücken (nur "
-"im Legacy Modus)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Durch drücken der F1 Taste erscheint ein neues Fenster mit weiteren "
 "verfügbaren Optionen. Wähle eine mit den Pfeiltasten aus und drücke Enter um "
@@ -2474,19 +2513,20 @@ msgstr ""
 "zurückzukehren."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Die detailierte Ansicht über die splash Optionen. Drücke ESC oder wähle "
 "<guilabel>Zurück zu Boot-Optionen</guilabel> um zurück zur Optionsliste zu "
@@ -2494,20 +2534,23 @@ msgstr ""
 "<guilabel>Boot-Optionen</guilabel> Zeile hinzugefügt werden."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "Die Hilfe wird in der, mit der F2 Taste, ausgewählten Sprache angezeigt."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2518,82 +2561,48 @@ msgstr ""
 "Wie_man_Kerneloptionen_einstellt\">https://wiki.mageia.org/de/"
 "Wie_man_Kerneloptionen_einstellt</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Verwenden eines kabelgebundenen Netzwerks"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Hier sehen Sie den Standard Willkommensbildschirm, wenn eine Installations "
-"CD für kabelgebundene Netzwerke verwendet wird (netinstall.iso oder "
-"netinstall-nonfree.iso Abbilder):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Es erlaubt Ihnen nicht die Sprache zu ändern. Die verfügbaren Optionen "
-"werden auf dem Bildschirm beschrieben. Für weitere Informationen über die "
-"Verwendung einer netzbasierten Installations CD, schau <link ns2:href="
-"\"https://wiki.mageia.org/en/Boot.iso_install\">ins Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Das Tastaturlayout ist das amerikanische."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Die Installationsschritte"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "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:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "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><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "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:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2613,17 +2622,17 @@ msgstr ""
 "\">Alt+Strg+Entf</emphasis>, um einen Neustart auszulösen."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsprobleme und mögliche Lösungen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Keine grafische Schnittstelle"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2635,13 +2644,16 @@ msgstr ""
 "code> eingeben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "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 "
@@ -2651,12 +2663,12 @@ msgstr ""
 "Installation im Textmodus fortgesetzt."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Die Installation friert ein"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2674,14 +2686,15 @@ msgstr ""
 "ist."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM Problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2694,18 +2707,20 @@ msgstr ""
 "code></emphasis> bestimmt eine Größe von 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamische Partitionen"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
-msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+#: en/installer.xml:251
+#, 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>."
 msgstr ""
 "Wenn Sie unter Windows Ihre Festplatte vom \"einfachen\" auf das \"dynamische"
 "\" Format konvertiert haben, sollten Sie wissen, dass es unmöglich ist, "
@@ -2724,17 +2739,18 @@ msgstr "Aktualisierungen (Updates)"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2744,10 +2760,11 @@ msgstr ""
 "erweitert."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Wählen Sie <guilabel>\"Ja\"</guilabel>, wenn Sie wünschen, diese herunter zu "
@@ -2756,8 +2773,9 @@ msgstr ""
 "sind."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr ""
 "Anschließend klicken Sie auf <guibutton>\"Weiter\"</guibutton>, um mit der "
 "Installation fortzufahren."
@@ -2817,18 +2835,18 @@ msgstr "Medienauswahl (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2841,7 +2859,7 @@ msgstr ""
 "zur Verfügung stehen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2850,7 +2868,7 @@ msgstr ""
 "die grundlegenden Pakete der Distribution enthält."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2865,13 +2883,14 @@ msgstr ""
 "verschiedene WLAN Karten, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Die <emphasis>Tainted</emphasis> Quelle enthält Pakete, die unter freien "
 "Lizenzen veröffentlicht sind. Die Hauptkriterien warum diese Pakete in "
@@ -2881,38 +2900,41 @@ msgstr ""
 "zum Abspielen von kommerziellen Video DVDs, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimale Installation"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Durch das Abwählen aller Paketgruppen im Auswahlmenü können Sie eine "
 "minimale Installation wählen, siehe <xref linkend=\"choosePackageGroups\"></"
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Wenn gewünscht, können Sie auf derselben Seite zusätzlich die Option für "
 "\"Individuelle Paketauswahl\" aktivieren."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Die minimale Installation ist für die Nutzer gedacht, die besondere "
 "Anwendungsmöglichkeiten für ihr <application>Mageia</application> im Sinn "
@@ -2923,9 +2945,10 @@ msgstr ""
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Falls Sie diese Installationsart wählen, wird das nächste Fenster eine "
@@ -2933,16 +2956,14 @@ msgstr ""
 "X, ...)."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Wenn ausgewählt, wird \"Mit X\" auch IceWM als eine leichtgewichtige Desktop-"
-"Umgebung beinhalten."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2957,15 +2978,15 @@ msgstr ""
 "manual/\">GNU coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2982,11 +3003,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX führt eine intelligente Auswahl für die Konfiguration Ihres Systems "
 "durch, abhängig von der von Ihnen getroffenen Auswahl und der von DrakX "
@@ -2996,9 +3018,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Als Grundregel können die Standardeinstellungen als die empfohlenen "
 "betrachtet werden, die Sie beibehalten können, außer bei folgenden 3 "
@@ -3018,78 +3041,82 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 "etwas anderes wird weiter unten, in den detaillierten Abschnitten, genannt"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Systemparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zeitzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX wählt eine Zeitzone für Sie, abhängig von der von Ihnen bevorzugten "
 "Sprache. Sie können die Zeitzone ändern, falls dies nötig ist. Siehe auch "
 "unter <xref linkend=\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Befinden Sie sich nicht im gewählten Land, so ist es sehr wichtig, dass Sie "
 "diese Einstellung korrigieren. Siehe <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "DrakX trifft normalerweise eine passende Auswahl für die Einstellungen des "
 "Bootloaders."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr ""
 "Ä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:69
+#: 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:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Benutzerverwaltung</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3098,22 +3125,23 @@ msgstr ""
 "benutzereigenen Ordnern unter <literal>/home</literal> angelegt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Dienste</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systemdienste beziehen sich auf die kleinen Programme, die im Hintergrund "
 "laufen (Daemons). Dieses Werkzeug erlaubt es Ihnen, verschiedene Tasks "
 "(Anwendungen/Aufgaben) zu aktivieren oder zu deaktivieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3122,32 +3150,33 @@ msgstr ""
 "- ein Fehler kann Ihren Computer davon abhalten, korrekt zu funktionieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Weitere Informationen finden Sie unter <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Hardwareparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastatur</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Hier bestimmen oder ändern Sie die Belegung Ihrer Tastatur, abhängig von "
 "Ihrem Standort, Ihrer Sprache oder dem Typ der Tastatur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3157,12 +3186,12 @@ msgstr ""
 "auch ändert."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Maus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3171,42 +3200,43 @@ msgstr ""
 "oder einstellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Soundkarte</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Der Installer 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:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafikkarte</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Dieser Abschnitt erlaubt es Ihnen, die Grafikkarte(n) und die Anzeige "
 "einzustellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Weitere Informationen finden Sie unter <xref linkend=\"configureX_chooser"
 "\"></xref>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3215,20 +3245,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Netzwerk- und Internetparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Netzwerk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3238,21 +3269,22 @@ msgstr ""
 "Repositorium noch nicht aktiviert haben."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Wenn Sie eine Netzwerkkarte hinzufügen, vergessen Sie nicht, die Firewall so "
 "zu setzen, dass auch diese Netzwerkkarte überwacht wird."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxys</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3263,24 +3295,25 @@ msgstr ""
 "konfigurieren, dass ein Proxy-Dienst verwendet wird."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr "Fragen Sie Ihren Systemadministrator nach Ihren Zugangsdaten."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sicherheit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Sicherheitsstufe</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3290,19 +3323,19 @@ msgstr ""
 "Zwecke."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 "Überprüfen Sie die Option, die Ihnen für Ihren Verwendungzweck am "
 "geeignetsten erscheint."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3312,7 +3345,7 @@ msgstr ""
 "wollen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3324,7 +3357,7 @@ msgstr ""
 "\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Beachten Sie aber, dass Sie ein großes Risiko eingehen, wenn Sie alles "
@@ -3395,41 +3428,73 @@ msgstr ""
 "Platz für die <application>Mageia</application> Installation zu schaffen."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Sicherheitsstufe"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Hier können Sie die Sicherheitsstufe einstellen."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Fortgeschritten</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"Lassen Sie diese Einstellungen, so wie sie sind, wenn Sie nicht genau "
-"wissen, was Sie auswählen sollen."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Nach der Installation ist es jederzeit möglich, die Sicherheitseinstellungen "
 "zu ändern, indem Sie im Mageia Kontrollzentrum den Abschnitt "
@@ -3447,25 +3512,27 @@ msgstr "Einleitung"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia wird als ISO Images veröffentlicht. Diese Seite wird Ihnen bei der "
 "Wahl des zu Ihren Bedürfnissen passenden Images helfen."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Es gibt zwei Arten von Medien:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassische Installationsroutine: Nachdem das Medium gebootet wurde, folgt "
 "ein Prozess, in dem ausgewählt werden kann, was installiert und wie das Ziel-"
@@ -3474,85 +3541,88 @@ msgstr ""
 "Desktop-Umgebung auswählen, die Sie nutzen möchten."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE Medium: Sie können vom Medium ein echtes Mageia System starten, ohne "
-"dieses zu installieren, um zu sehen was Sie nach der Installation erhalten "
-"werden. Der Installationsvorgang ist einfacher, jedoch haben Sie weniger "
-"Auswahlmöglichkeiten."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "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:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Medien"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "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:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Sie können diese <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">hier</link> finden."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassische Installationsmedien"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Grundsätzliche Eigenschaften"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 "Diese ISOs verwenden ein traditionelles Installationsprogramm namens drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "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:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Verschiedene Medien für 32- oder 64-Bit-Architekturen."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3561,12 +3631,12 @@ msgstr ""
 "Speichertest, Hardware-Erkennungswerkzeug."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Jede DVD enthält viele verfügbare Desktop-Umgebungen und Sprachen."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3574,101 +3644,106 @@ msgstr ""
 "hinzuzufügen."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live Medien"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Kann dazu verwendet werden um die Distribution zu testen ohne diese auf eine "
 "Festplatte zu installieren, kann jedoch optional auch auf eine Festplatte "
 "installiert werden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "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:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">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><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Sie enthält unfreie Software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live-DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Nur Plasma Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Alle Sprachen sind vorhanden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Nur 64-Bit-Architektur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live-DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Nur GNOME Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live-DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Nur Xfce Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 oder 64-Bit-Architektur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Boot-only CD Medien"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3680,28 +3755,30 @@ msgstr ""
 "Netzwerk oder im Internet befinden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Nur englische Sprache."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3735,11 +3812,12 @@ msgstr "Herunterladen"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "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 "
@@ -3754,10 +3832,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum und sha1sum sind Werkzeuge um die Integrität der ISO-Datei zu "
 "überprüfen. Verwenden sie nur eines der beiden. Behalte eines von diesen "
@@ -3771,8 +3850,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Wähle den Auswahlknopf \"Datei speichern\"."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3780,14 +3859,15 @@ 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:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Beide Prüfsummen sind hexadezimal Zahlen, welche durch einen Algorithmus von "
 "der Datei berechnet wurden, welche heruntergeladen werden soll. Wenn Sie den "
@@ -3799,70 +3879,85 @@ msgstr ""
 "Verwendung von BitTorrent durchführen sollten."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Öffne eine Konsole, Sie müssen hierfür nicht root sein, und:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Um md5sum zu verwenden, geben Sie ein: [sam@localhost]$ <userinput>md5sum "
 "Pfad/zu/der/Abbild/Datei.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Um sha1sum zu verwenden, geben Sie ein: [sam@localhost]$ "
 "<userinput>sha1sum Pfad/zu/der/Abbild/Datei.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"und vergleiche die angezeigt Nummer auf Ihrem Computer (Sie müssen "
-"wahrscheinlich eine weile warten) mit der Nummer die Sie von Mageia "
-"erhalten. Beispiel:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"und vergleiche die angezeigt Nummer auf Ihrem Computer (Sie müssen "
+"wahrscheinlich eine weile warten) mit der Nummer die Sie von Mageia "
+"erhalten. Beispiel:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Brennen oder übertragen der ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "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 und "
 "zielt darauf ab ein bootbares Medium zu erstellen."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO auf eine CD/DVD brennen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Verwenden Sie, welchen Brenner Sie möchten, aber stellen Sie sicher, dass "
 "dieser korrekt auf <emphasis role=\"bold\">Ein Abbild schreiben</emphasis> "
@@ -3871,12 +3966,12 @@ msgstr ""
 "Images_auf_CD_und_DVD_brennen\">Mageia Wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "ISO auf einen USB-Stick übertragen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3885,18 +3980,19 @@ msgstr ""
 "'dumpen' können um davon zu booten und das System zu installieren."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3905,12 +4001,12 @@ msgstr ""
 "neu partitionieren und formatieren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 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:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3920,74 +4016,73 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Verwenden eines grafischen Werkzeugs in Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Sie können versuchen:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> mit "
 "Verwendung der Auswahl \"ISO-Abbild\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Verwenden der Befehlszeile in einem GNU/Linux System"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Es ist möglicherweise *gefährlich*, dies manuell durchzuführen. Es besteht "
 "das Risiko, dass Sie die falsche Partition überschreiben, wenn Sie aus "
 "Versehen die falsche Geräte-ID verwenden."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Sie können auch das dd Werkzeug in der Konsole verwenden:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Öffnen Sie eine Konsole"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Werden Sie root 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:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3997,29 +4092,41 @@ msgstr ""
 "auf diesen zugreift oder liest)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Geben Sie den Befehl <userinput>fdisk -l</userinput> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"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
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "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 "
 "<emphasis>sd</emphasis> beginnt, welches im unteren Beispiel <emphasis>sdd</"
 "emphasis> ist:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4061,46 +4168,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"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."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Geben den Befehl # <userinput>dd if=pfad/zu/der/ISO/dateiname of=/dev/sdX "
 "bs=1M</userinput> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Wobei X = der Name Ihres Gerätes ist, z.B. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Beispiel: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Geben Sie den Befehl # <userinput>sync</userinput> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Entferne den USB-Stick, es ist fertig"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4131,9 +4247,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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 "
@@ -4141,10 +4258,11 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Finden Sie Ihr Land nur in der Liste <guilabel>Andere Länder</guilabel>, "
@@ -4153,18 +4271,19 @@ msgstr ""
 "ignorieren Sie dies, DrakX befolgt die von Ihnen getroffene Auswahl."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Eingabemethode"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Im <guilabel>Andere Länder</guilabel> Bildschirm können Sie weitere "
@@ -4177,11 +4296,13 @@ msgstr ""
 "bevor Sie diese Pakete auswählen."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Falls Sie die Einrichtung der Eingabemethode während der Installation "
 "verpasst haben, können Sie auch darauf zugreifen, nachdem sie Ihr "
@@ -4189,56 +4310,54 @@ msgstr ""
 "neu gestartet haben, oder indem Sie localedrake als root ausführen."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installation oder Aktualisierung"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectInstallClass."
-"png\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installation"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Verwenden Sie diese Option für eine frische <application>Mageia</"
-"application>-Installation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Aktualisiere Mageia"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Falls Sie eine oder mehrere <application>Mageia</application> Installationen "
-"auf ihrem Rechner haben, können Sie mit Hilfe des Installers eine davon auf "
-"die neueste Version upgraden."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Während der Veröffentlichung dieses Installers ist nur das Upgrade von der "
 "zuletzt <emphasis>unterstützten</emphasis> Mageia Version gründlich getestet "
@@ -4247,16 +4366,17 @@ msgstr ""
 "durchzuführen und ihre <literal>/home</literal> Partition bestehen zu lassen."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Falls Sie während des Installationsvorgangs die Installation abbrechen "
 "wollen, besteht die Möglichkeit, das System neu zu booten.  Denken Sie aber "
@@ -4269,12 +4389,14 @@ msgstr ""
 "<guilabel>Strg+Alt+Entf</guilabel> um den Neustart durchzuführen."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Falls Sie es versäumt haben, bei der Installation eine zusätzliche Sprache "
 "hinzuzufügen, können Sie vom \"Installations- oder Upgrade-Fenster\" zum "
@@ -4310,12 +4432,12 @@ msgstr ""
 "getroffen, welche Sie zuvor ausgewählt haben."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4325,16 +4447,17 @@ msgstr ""
 "Tastatur verwendet."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
-"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4353,23 +4476,25 @@ msgstr ""
 "Tastaturbelegung</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "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, "
@@ -4379,23 +4504,24 @@ msgstr ""
 "Liste gewählt wurde."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Wählen Sie eine Tastatur, die auf nicht-lateinischen Zeichen beruht, so "
 "sehen Sie einen zusätzlichen Dialog, der Sie fragt, wie Sie zwischen den "
 "lateinischen und nicht-lateinischen Tastaturbelegungen umschalten möchten."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 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:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4408,7 +4534,7 @@ msgstr ""
 "System."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4418,12 +4544,13 @@ msgstr ""
 "installierende System verwenden."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Wünschen (oder benötigen) Sie mehrere installierte Sprachen auf Ihrem "
 "System, für Sie selbst und/oder andere Anwender, dann sollten Sie den Knopf "
@@ -4432,7 +4559,7 @@ msgstr ""
 "komplexer, erst nach der Installation weitere Sprachen hinzuzufügen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4445,18 +4572,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "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:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4466,23 +4594,24 @@ msgstr ""
 "zu wählen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia verwendet standardmäßig die UTF-8 (Unicode) Unterstützung."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Dies kann in der Ansicht \"Mehrere Sprachen\" deaktiviert werden, wenn Sie "
 "wissen, dass es für Ihre Sprache notwendig ist. Das Deaktivieren von UTF-8 "
 "wirkt sich auf alle installierten Sprachen aus."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4538,71 +4667,76 @@ msgstr ""
 "Multifunktionsmaus zu konfigurieren."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Hinzufügen oder ändern eines Boot Menü Eintrags"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "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><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "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/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Bootloader Oberfläche"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Standardmäßig verwendet Mageia ausschließlich:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (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:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+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:29
+#: 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:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 auf Legacy/MBR und Legacy/GPT Systeme"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4615,27 +4749,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Ändern Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi auf UEFI Systeme"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Mit einem UEFI System ist die Benutzeroberfläche deutlich anders, da Sie "
 "nicht zwischen einer Oberfläche mit oder ohne grafischem Menü wählen können"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4648,14 +4787,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Wenn Mageia das einzige Betriebssystem ist, welches auf Ihrem Computer "
@@ -4668,37 +4808,42 @@ msgstr ""
 "diese ist auch ausreichend, egal wie viele Betriebssysteme Sie verwenden."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Verwenden des Mageia Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 "Standardmäßig, entsprechend Ihres Systems, schreibt Mageia folgendes neu:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 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:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi Bootloader in die ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Falls Sie bereits andere Betriebssysteme installiert haben wird Mageia diese "
 "in Ihr neues Mageia Bootmenü hinzufügen. Falls Sie dies nicht haben möchten, "
@@ -4706,7 +4851,7 @@ msgstr ""
 "<guilabel>Fremdes OS testen</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4719,18 +4864,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Verwenden eines bestehenden Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Die exakte Prozedur zum Hinzufügen Ihres Mageia-Systems zu einem bestehenden "
 "Bootloader finden Sie weiter unten in dieser Hilfe, wobei es in den meisten "
@@ -4740,16 +4886,17 @@ msgstr ""
 "offen sind."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Verwenden des Chain-Loader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Falls Sie kein bootbares Mageia haben möchten, dieses jedoch über den "
 "Chainloader eines anderen Betriebssystem starten möchten, klicke auf "
@@ -4758,7 +4905,7 @@ msgstr ""
 "MBR</guilabel> aus."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4771,7 +4918,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4780,7 +4927,7 @@ msgstr ""
 "Sie diese Meldung indem Sie auf <guibutton>OK</guibutton> drücken."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4789,33 +4936,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Erste Seite"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>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:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Sicherheit</guilabel>: Dies erlaubt Ihnen ein Passwort für den "
 "Bootloader festzulegen. Dies bedeutet, dass der Benutzername und das "
@@ -4824,37 +4972,37 @@ msgstr ""
 "das Passwort ist welches, dass Sie in diesem Abschnitt festlegen können."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>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:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>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><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Fortgeschrittene Optionen</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI aktivieren:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) ist ein Standard für die Energieverwaltung. Es kann durch das "
@@ -4865,21 +5013,22 @@ msgstr ""
 "(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:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP 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:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC aktivieren</guilabel>: Aktivieren oder deaktivierten dieser "
 "Option erlaubt dem Betriebssystem Zugriff auf den Advanced Programmable "
@@ -4887,29 +5036,30 @@ msgstr ""
 "Prioritätenmodell und erweiterte IRC (Interrupt Request) Verwaltung."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>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:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Nächste Seite"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Standard:</guilabel> Das Betriebssystem das als Standardsystem "
 "voreingestellt werden soll"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4919,7 +5069,7 @@ msgstr ""
 "Informationen beim Booten zu geben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4928,18 +5078,19 @@ msgstr ""
 "\"setupMageiaBootloader\">Verwenden des Mageia Bootloaders</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>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:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4949,7 +5100,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI-Laufwerke einrichten"
 
@@ -4962,36 +5113,39 @@ msgstr "SCSI-Laufwerke einrichten"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX erkennt normalerweise Festplatten korrekt. Möglicherweise treten bei "
 "der Erkennung alter SCSI-Controller Probleme auf. In diesem Fall könnte die "
 "Installation der notwendigen Treiber fehlschlagen."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Falls dies geschieht, müssen Sie DrakX händisch mitteilen, welche SCSI-"
 "Laufwerke Sie haben."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "Danach sollte DrakX die Laufwerke korrekt konfigurieren können."
 
@@ -5012,10 +5166,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "In diesem Bildschirm steht der Name des Treibers, den der Installer für ihre "
 "Soundkarte gewählt hat, welches der Standardtreiber ist"
@@ -5038,26 +5192,30 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Dann wählen sie in draksound oder im Menü \"Soundkonfiguration\" auf "
 "<guibutton>Fortgeschritten</guibutton> und dann <guibutton>Problembehebung</"
 "guibutton> um hilfreiche Hinweise zu bekommen, wie das Problem zu lösen ist."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Während der Installation ist die Auswahl von <guibutton>Fortgeschritten</"
 "guibutton> in dem Fenster hilfreich, falls kein Standardtreiber vorhanden "
@@ -5065,16 +5223,17 @@ msgstr ""
 "den falschen ausgewählt hat."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Im Falle, dass ein anderer Treiber ausgewählt werden soll, klicken Sie auf "
 "<guibutton>Soll irgendein Treiber ausgewählt werden?</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Bestätigen, dass die Festplatte formatiert wird"
 
@@ -5085,13 +5244,13 @@ msgstr "Bestätigen, dass die Festplatte formatiert wird"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -5101,18 +5260,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klicken Sie auf <guibutton>Abbrechen</guibutton>, wenn Sie sich bei der "
 "Auswahl nicht sicher sind."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klicken Sie auf <guibutton>Weiter</guibutton>, wenn Sie sich sicher sind und "
 "jede Partition, jedes Betriebssystem und alle Daten auf dem Laufwerk löschen "
@@ -5242,16 +5404,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia deinstallieren"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Kurzanleitung"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Wenn Mageia Sie nicht überzeugt hat oder Sie es nicht richtig installieren "
@@ -5259,28 +5417,30 @@ msgstr ""
 "Mageia gibt Ihnen auch die Möglichkeit, es zu deinstallieren. Das trifft "
 "nicht auf jedes Betriebssystem zu."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Nach der Sicherung Ihrer Daten, starten Sie die Mageia DVD neu und wählen "
 "Systemrettung, dann, Windows Bootloader wiederherstellen. Beim nächsten Boot "
 "haben Sie dann nur noch Windows und keine Option mehr, Ihr Betriebssystem "
 "auszuwählen."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Um in Windows den durch die Mageia-Partitionen genutzten Speicherplatz "
 "wiederzubekommen, klicken Sie auf <code>Start -> Systemsteuerung -> "
@@ -5291,8 +5451,8 @@ msgstr ""
 "jede dieser Partitionen und wählen Sie <guibutton>Löschen</guibutton>. Der "
 "Speicherplatz wird freigegeben."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5301,14 +5461,15 @@ msgstr ""
 "diese formatieren (FAT32 oder NTFS). Diese wird einen Partitionsbuchstaben "
 "erhalten."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Wenn Sie Windows Vista oder Windows 7 verwenden, haben Sie auch die "
 "Möglichkeit, die vorhandene Partition auf der linken Seite des "
@@ -5363,3 +5524,345 @@ 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 ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Passwort (wiederholen)</guilabel>: Geben Sie wiederum das "
+#~ "Passwort des Benutzers in diese Textbox ein, und <emphasis role=\"bold"
+#~ "\">drakx</emphasis> überprüft auf Übereinstimmung der beiden Passwörter "
+#~ "für den Benutzer in den beiden Textboxen."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Zudem können Sie einen Gastzugang aktivieren oder deaktivieren."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Jedes Gast-Benutzerkonto, das mit einem vorgegebenen <emphasis>rbash</"
+#~ "emphasis>-Gastzugang und im Ordner <emphasis>/home</emphasis> gespeichert "
+#~ "ist, wird gelöscht, wenn sich der Gast abmeldet. Der Gast sollte daher "
+#~ "seine wichtigen Daten auf einen USB-Stick sichern."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Gast-Benutzerkonto</guilabel>: Hier können Sie das Gast-"
+#~ "Benutzerkonto aktivieren oder deaktivieren. Das Gast- Benutzerkonto "
+#~ "erlaubt es einem Gast, sich am System anzumelden und den PC zu verwenden. "
+#~ "Dieser Gast hat aber eingeschränktere Rechte als ein normaler Benutzer."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Gruppen-ID</guilabel>: Dies ermöglicht Ihnen das Setzen einer "
+#~ "Gruppen-ID. Ebenfalls eine Zahl, normalerweise die gleiche Zahl wie für "
+#~ "den Benutzer. Lassen Sie diese Eingabe solange leer, bis Sie wissen was "
+#~ "Sie tun."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Gerät\", ist gegliedert in: \"Festplatte\", [\"Festplattennummer"
+#~ "\"(Zahl)], \"Partitionsnummer\" (z.B. \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Workstation"
+
+#~ msgid "Server."
+#~ msgstr "Server"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafische Umgebung"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "  <imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Sie finden hier vier Gruppen. Klicken Sie auf das Dreieck vor einer "
+#~ "Gruppe, um alle Dienste zu sehen, die von dieser Gruppe bereitgestellt "
+#~ "werden."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Falls Sie Ihre Karte nicht in der Herstellerliste finden, weil sie sich "
+#~ "nicht in der Datenbank befindet oder weil es sich um eine ältere Karte "
+#~ "handelt, könnten Sie einen passenden Treiber in Xorg finden."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "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 ""
+#~ "Dies ist der Reiter für jedes entdeckte Laufwerk oder Speichermedium, wie "
+#~ "einem USB-Stick. So z.B.  <emphasis>sda</emphasis>, <emphasis>sdb</"
+#~ "emphasis> und <emphasis>sdc</emphasis>, wenn drei Laufwerke gefunden "
+#~ "wurden."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Der Installer wird den verfügbaren Speicherplatz anhand der folgenden "
+#~ "Regeln aufteilen:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Ausrichten an:\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Vorhergehender freier Speicherplatz (MiB):\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Von diesem Fenster aus, ist es möglich, einige persönliche Einstellungen "
+#~ "vorzunehmen:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Die Sprache (nur für die Installation, diese kann eine andere als die für "
+#~ "das System sein) durch drücken der F2 Taste (nur im Legacy Modus)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Hier sehen Sie z.B. den französischen Willkommensbildschirm wenn eine "
+#~ "Live DVD/CD verwendet wird. Beachte dass das Live DVD/CD Menü nicht die "
+#~ "Auswahl <guilabel>Rettungssystem</guilabel>, <guilabel>Speichertest</"
+#~ "guilabel> und <guilabel>Hardware-Erkennungswerkzeug</guilabel> enthält."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Fügen Sie durch Drücken der Taste <emphasis role=\"bold\">F6</emphasis> "
+#~ "im alten Modus oder der Taste <emphasis role=\"bold\">e</emphasis> im "
+#~ "UEFI-Modus einige Kernel-Optionen hinzu."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Wenn die Installation fehlschlägt, ist es eventuell notwendig dies erneut "
+#~ "mit extra Optionen zu probieren. Das Menü zeigt durch drücken den F6 "
+#~ "Taste eine neue Zeile, welche <guilabel>Boot-Optionen</guilabel> heißt "
+#~ "und vier Einträge enthält:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Fügen Sie weitere Kerneloptionen hinzu indem Sie die F1 Taste drücken "
+#~ "(nur im Legacy Modus)"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Verwenden eines kabelgebundenen Netzwerks"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Hier sehen Sie den Standard Willkommensbildschirm, wenn eine "
+#~ "Installations CD für kabelgebundene Netzwerke verwendet wird (netinstall."
+#~ "iso oder netinstall-nonfree.iso Abbilder):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Es erlaubt Ihnen nicht die Sprache zu ändern. Die verfügbaren Optionen "
+#~ "werden auf dem Bildschirm beschrieben. Für weitere Informationen über die "
+#~ "Verwendung einer netzbasierten Installations CD, schau <link ns2:href="
+#~ "\"https://wiki.mageia.org/en/Boot.iso_install\">ins Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Das Tastaturlayout ist das amerikanische."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Wenn ausgewählt, wird \"Mit X\" auch IceWM als eine leichtgewichtige "
+#~ "Desktop-Umgebung beinhalten."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Hier können Sie die Sicherheitsstufe einstellen."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Lassen Sie diese Einstellungen, so wie sie sind, wenn Sie nicht genau "
+#~ "wissen, was Sie auswählen sollen."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE Medium: Sie können vom Medium ein echtes Mageia System starten, ohne "
+#~ "dieses zu installieren, um zu sehen was Sie nach der Installation "
+#~ "erhalten werden. Der Installationsvorgang ist einfacher, jedoch haben Sie "
+#~ "weniger Auswahlmöglichkeiten."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Boot-only CD Medien"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Wähle den Auswahlknopf \"Datei speichern\"."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Sie können auch das dd Werkzeug in der Konsole verwenden:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Entferne den USB-Stick, es ist fertig"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "selectInstallClass.png\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Verwenden Sie diese Option für eine frische <application>Mageia</"
+#~ "application>-Installation."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Falls Sie eine oder mehrere <application>Mageia</application> "
+#~ "Installationen auf ihrem Rechner haben, können Sie mit Hilfe des "
+#~ "Installers eine davon auf die neueste Version upgraden."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Kurzanleitung"
diff --git a/docs/docs/stable/installer/el.po b/docs/docs/stable/installer/el.po
index 12e61aeb..d2255f0a 100644
--- a/docs/docs/stable/installer/el.po
+++ b/docs/docs/stable/installer/el.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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-07-05 19:09+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -29,12 +29,13 @@ msgstr "Άδεια χρήσης και σημειώσεις έκδοσης"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -67,8 +68,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Για να τους αποδεχτείτε, απλά επιλέξτε <guilabel>Αποδοχή</guilabel> και "
@@ -90,9 +92,10 @@ msgstr "Σημειώσεις έκδοσης"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Κάνοντας κλικ στο κουμπί <guibutton>Σημειώσεις έκδοσης</guibutton>, θα "
@@ -100,13 +103,13 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "el"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
 
@@ -114,23 +117,25 @@ msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Σε αυτήν την οθόνη έχετε μια λίστα των ήδη αναγνωρισμένων αποθετηρίων. "
 "Μπορείτε να προσθέσετε και άλλες πηγές πακέτων, όπως έναν οπτικό οδηγό ή μια "
@@ -138,23 +143,25 @@ msgstr ""
 "διαθέσιμα για επιλογή στα επόμενα βήματα."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Για μια δικτυακή πηγή, θα πρέπει να ακολουθήσετε δυο βήματα:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Επιλογή και ενεργοποίηση του δικτύου, αν δεν είναι ήδη ενεργοποιημένο."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Επιλογή ενός καθρεπτισμού ή καθορισμός του URL (η πρώτη καταχώρηση). "
 "Επιλέγοντας έναν καθρεπτισμό , έχετε τη δυνατότητα να επιλέξετε μεταξύ των "
@@ -163,14 +170,15 @@ msgstr ""
 "δική σας εγκατάσταση NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Αν κάνετε ενημέρωση μιας 64 δυφίων εγκατάστασης η οποία μπορεί να περιέχει "
 "μερικά 32 δυφίων πακέτα, συνιστάται να χρησιμοποιήσετε την οθόνη προσθήκης "
@@ -187,7 +195,7 @@ msgstr "Διαχείριση χρήστη και διαχειριστή"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -200,21 +208,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ορίστε τον κωδικό πρόσβασης του διαχειριστή (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Είναι ορθό για όλες τις εγκαταστάσεις <application>Mageia</application> να "
 "ορίσετε έναν κωδικό υπερχρήστη ή διαχειριστή (στο Linux συνήθως λέγεται "
@@ -227,9 +235,10 @@ msgstr ""
 "συγκρίνοντάς τους."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Όλοι οι κωδικοί κάνουν διάκριση μεταξύ πεζών και κεφαλαίων, συνιστάται η "
@@ -237,16 +246,18 @@ msgstr ""
 "σε έναν κωδικό."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Εισαγωγή ενός χρήστη"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Προσθέστε έναν χρήστη εδώ. Ένας χρήστης έχει λιγότερα δικαιώματα από τον "
 "διαχειριστή (root), αλλά αρκετά από προεπιλογή ώστε να πλοηγηθεί στο "
@@ -254,7 +265,7 @@ msgstr ""
 "οτιδήποτε άλλο κάνει ένας μέσος χρήστης με τον υπολογιστή του."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -263,7 +274,7 @@ msgstr ""
 "αλλάξει το εικονίδιο του χρήστη."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -272,10 +283,11 @@ msgstr ""
 "χρήστη σε αυτό το πλαίσιο κειμένου."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Όνομα χρήστη</guilabel>: Εδώ μπορείτε να πληκτρολογήσετε ένα όνομα "
@@ -284,11 +296,12 @@ msgstr ""
 "και κεφαλαίων.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Κωδικός πρόσβασης</guilabel>: Σε αυτό το πλαίσιο κειμένου θα "
 "πρέπει να πληκτρολογήσετε τον κωδικό πρόσβασης του χρήστη.  Και εδώ, υπάρχει "
@@ -296,30 +309,31 @@ msgstr ""
 "κωδικός πρόσβασης του χρήστη. (Δείτε επίσης <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε εδώ την "
-"πληκτρολόγηση του κωδικού πρόσβασης του χρήστη και το drakx θα ελέγξει ότι "
-"έχετε πληκτρολογήσει τον ίδιο κωδικό σε όλα τα πεδία εισαγωγής κωδικού "
-"πρόσβασης του χρήστη."
+"<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε την πληκτρολόγηση "
+"του κωδικού πρόσβασης και το Drakx θα ελέγξει αν ο κωδικός πρόσβασης "
+"ταιριάζει με τον ανωτέρω."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Κάθε χρήστη που προσθέτετε κατά την εγκατάσταση της Mageia, θα έχει έναν "
 "κατάλογο με προστασία εγγραφής και ανάγνωσης (umask=27)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -328,92 +342,61 @@ msgstr ""
 "<emphasis>Διαχείριση χρηστών</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Οι άδειες πρόσβασης μπορούν επίσης να τροποποιηθούν και μετά την εγκατάσταση."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Προχωρημένη διαχείριση χρήστη"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Αν κάνετε κλικ στο κουμπί <guibutton>για προχωρημένους</guibutton> θα "
 "εμφανιστεί αυτή η οθόνη που σας επιτρέπει να επεξεργαστείτε τις ρυθμίσεις "
 "για τον χρήστη που κάνετε προσθέτετε."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-"Επιπροσθέτως, μπορείτε να απενεργοποιήσετε ή να ενεργοποιήσετε ένα "
-"λογαριασμό επισκέπτη."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Οτιδήποτε αποθηκεύει ένας επισκέπτης με τον προκαθορισμένο λογαριασμό guest "
-"<emphasis>rbash</emphasis> στον προσωπικό του κατάλογό /home θα διαγράφεται. "
-"Ο guest θα πρέπει να αποθηκεύει τα σημαντικά του αρχεία σε ένα stick USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Ενεργοποίηση λογαριασμού guest</guilabel>: Εδώ μπορείτε να "
-"ενεργοποιήσετε ή να απενεργοποιήσετε ένα λογαριασμό επισκέπτη. Ο λογαριασμός "
-"guest επιτρέπει σε έναν επισκέπτη να συνδεθεί και να χρησιμοποιήσει τον "
-"υπολογιστή, αλλά έχει περισσότερη περιορισμένη πρόσβαση σε σχέση με τους "
-"τυπικούς χρήστες."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Κέλυφος</guilabel>: Αυτή η κυλιόμενη λίστα σας επιτρέπει να "
 "αλλάξετε το κέλυφος που χρησιμοποιείται από τον χρήστη που προσθέτετε στην "
 "προηγούμενη οθόνη. Οι επιλογές είναι Bash, Dash και Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Αναγνωριστικό χρήστη</guilabel>: Εδώ μπορείτε να ορίσετε το ID του "
 "χρήστη που προσθέτετε στην προηγούμενη οθόνη.  Πρόκειται για έναν αριθμό. "
 "Μην εισάγετε κάτι εδώ αν δεν γνωρίζετε για το τι πρόκειται."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Αναγνωριστικό ομάδας</guilabel>: Σας επιτρέπει να ορίσετε το ID "
-"της ομάδας. Επίσης πρόκειται για έναν αριθμό, συνήθως ο ίδιος με αυτόν του "
-"χρήστη."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Επιλογή των σημείων προσάρτησης"
 
@@ -430,13 +413,14 @@ msgstr "Επιλογή των σημείων προσάρτησης"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -446,7 +430,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -457,41 +441,45 @@ msgstr ""
 "να αλλάξετε τα σημεία προσάρτησης."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Αν πραγματοποιήσετε οποιαδήποτε αλλαγή, σιγουρευτείτε ότι έχετε πάντα μια "
 "κατάτμηση<literal> /</literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Κάθε κατάτμηση εμφανίζεται ως ακολούθως: «Συσκευή» («Χωρητικότητα», «Σημείο "
 "προσάρτησης», «Τύπος»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"Η «Συσκευή», συντελείται από: «σκληρός δίσκος», [«αριθμός σκληρού "
-"δίσκου»(γράμμα)], «αριθμός κατάτμησης» (για παράδειγμα, «sda5»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Αν έχετε πολλές κατατμήσεις, μπορείτε να επιλέξετε πολλαπλά διαφορετικά "
 "σημεία προσάρτησης από το κυλιόμενο μενού, όπως <literal>/</literal>, "
@@ -502,20 +490,22 @@ msgstr ""
 "μιας εγκατάστασης cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Για τις κατατμήσεις που δεν χρειάζεστε να έχετε πρόσβαση, μπορείτε να "
 "αφήσετε το πεδίο του σημείου προσάρτησης κενό."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Επιλέξτε <guibutton>Προηγούμενο</guibutton> αν δεν είστε σίγουρος-η τι να "
 "επιλέξετε, και στη συνέχεια επιλέξτε <guilabel>Προσαρμοσμένη κατάτμηση του "
@@ -523,7 +513,7 @@ msgstr ""
 "κατάτμηση για να δείτε τον τύπο και το μέγεθός της."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -795,8 +785,9 @@ msgstr "Επιλογή περιβάλλοντος εργασίας"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Ανάλογα με τις επιλογές σας σε αυτήν την οθόνη, πιθανώς να ερωτηθείτε στη "
@@ -804,8 +795,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -824,14 +816,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Επιλέξτε αν προτιμάτε να χρησιμοποιήσετε το περιβάλλον εργασίας "
 "<application>KDE</application> ή <application>Gnome</application>. Και τα "
@@ -859,8 +853,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -873,62 +868,70 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Σταθμός εργασίας."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Εξυπηρετητής."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Γραφικό περιβάλλον."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Επιλογή μεμονωμένων πακέτων: Μπορείτε να χρησιμοποιήσετε αυτή την επιλογή "
 "για την προσθήκη επιπλέον πακέτων χειροκίνητα."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Ανατρέξτε στο <xref linkend=\"minimal-install\"/> για οδηγίες σχετικά με το "
 "πώς να κάνετε μια ελάχιστη εγκατάσταση (δίχως ή με X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Επιλογή μεμονωμένων πακέτων"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Εδώ μπορείτε να προσθέσετε οποιαδήποτε επιπλέον πακέτα για να προσαρμόσετε "
 "την εγκατάστασή σας."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -945,47 +948,45 @@ msgstr ""
 "επιλέγοντας την φόρτωσή του."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Διαμορφώστε τις υπηρεσίες σας"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Εδώ μπορείτε να ορίσετε ποιες υπηρεσίες (δεν) θα πρέπει να εκκινηθούν κατά "
 "την εκκίνηση του συστήματός σας."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Υπάρχουν τέσσερις ομάδες, κάντε κλικ στο τρίγωνο μπροστά από μια ομάδα για "
-"την ανάπτυξή τους και για να δείτε όλες τις υπηρεσίες σε αυτήν."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Οι ρυθμίσεις που επιλέγει το DrakX είναι συνήθως σωστές."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -994,7 +995,7 @@ msgstr ""
 "σχετικές πληροφορίες."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλά τι κάνετε."
 
@@ -1007,12 +1008,13 @@ msgstr "Διαμόρφωση της ζώνης ώρας"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1022,18 +1024,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Επιλέξτε τη ζώνη ώρας σας επιλέγοντας τη χώρα ή μια πόλη κοντά σας στην ίδια "
 "ζώνη ώρας."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Στην επόμενη οθόνη μπορείτε να επιλέξετε τη ρύθμιση του ρολογιού του BIOS "
 "στην τοπική ώρα ή GMT, γνωστή και ως UTC."
@@ -1049,23 +1053,23 @@ msgstr ""
 "σύνολό τους."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Επιλέξτε έναν εξυπηρετητή X (Διαμόρφωση της κάρτας γραφικών)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1074,7 +1078,7 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά την κάρτα σας."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1083,37 +1087,30 @@ msgstr ""
 "γνωρίζετε τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου ανά:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "κατασκευαστή"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "έπειτα το όνομα του μοντέλου της κάρτας"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "και τον τύπο της κάρτας"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Αν δεν μπορείτε να βρείτε την κάρτα σας στη λίστα κατασκευαστών (διότι δεν "
-"βρίσκεται ακόμα στη βάση δεδομένων ή πρόκειται για μια παλιά κάρτα) ίσως να "
-"βρείτε έναν κατάλληλο οδηγό στην κατηγορία Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Η λίστα του Xorg περιλαμβάνει περισσότερους από 40 γενικούς και ανοιχτού "
 "κώδικα οδηγούς καρτών γραφικών.  Αν ακόμα δεν μπορείτε να βρείτε έναν οδηγό "
@@ -1121,63 +1118,67 @@ msgstr ""
 "οποίος παρέχει τις βασικές λειτουργίες της κάρτας."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Προσέξτε διότι αν επιλέξετε έναν ακατάλληλο οδηγό θα έχετε πρόσβαση μόνο στη "
 "γραμμή εντολών."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Μερικοί κατασκευαστές καρτών γραφικών παρέχουν ιδιόκτητους οδηγούς για Linux "
 "οι οποίοι μπορεί να διατεθούν μόνο από τα αποθετήρια Nonfree και σε "
 "ορισμένες περιπτώσεις μόνο από την ιστοσελίδα του κατασκευαστή της κάρτας"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Τα αποθετήρια Nonfree θα πρέπει να ενεργοποιηθούν ώστε να αποκτήσετε "
 "πρόσβαση, θα πρέπει να το κάνετε μετά την πρώτη σας επανεκκίνηση."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Δεν έχει σημασία το γραφικό περιβάλλον (επίσης γνωστό ως περιβάλλον "
 "εργασίας) που επιλέγετε για αυτήν την εγκατάσταση της <application>Mageia</"
@@ -1189,7 +1190,7 @@ msgstr ""
 "ότι είναι η σωστή επιλογή."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1198,13 +1199,14 @@ msgstr ""
 "κάρτα σας από τη λίστα αν είναι απαραίτητο."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Οθόνη</guibutton></emphasis>: Μπορείτε να επιλέξετε "
 "<guilabel>Άμεσης τοποθέτησης και λειτουργίας</guilabel> αν είναι εφικτό, ή "
@@ -1214,30 +1216,31 @@ msgstr ""
 "ανανέωσης της οθόνης σας χειροκίνητα."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Μια εσφαλμένη συχνότητα ανανέωσης μπορεί να καταστρέψει την οθόνη σας"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Ανάλυση</guibutton></emphasis>: Ορίστε την επιθυμητή "
 "ανάλυση και βάθος χρώματος της οθόνης σας εδώ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Δοκιμή</guibutton></emphasis>: Το κουμπί δοκιμή δεν "
 "εμφανίζεται πάντα κατά την εγκατάσταση. Αν το κουμπί υπάρχει, μπορείτε να "
@@ -1250,7 +1253,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1259,12 +1262,12 @@ msgstr ""
 "επιλέξετε την ενεργοποίηση ή απενεργοποίηση ορισμένων παραμέτρων."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Επιλογή της οθόνης"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1273,12 +1276,13 @@ msgstr ""
 "συνήθως θα αναγνωρίσει σωστά και τη δική σας."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Η επιλογή μιας οθόνης με διαφορετικά χαρακτηριστικά μπορεί να "
 "καταστρέψει την οθόνη σας ή τη συσκευή γραφικών. Παρακαλώ μην προσπαθείτε να "
@@ -1286,23 +1290,23 @@ msgstr ""
 "έχετε αμφιβολίες θα πρέπει να συμβουλευτείτε την τεκμηρίωση της οθόνης σας"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Προσαρμοσμένο</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1316,7 +1320,7 @@ msgstr ""
 "οποία εμφανίζονται οι γραμμές σάρωσης."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1329,12 +1333,12 @@ msgstr ""
 "συμβουλευτείτε την τεκμηρίωση της οθόνης σας."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Άμεσης τοποθέτησης και λειτουργίας</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1343,12 +1347,12 @@ msgstr ""
 "τύπου της οθόνης από τη βάση δεδομένων με τις συσκευές οθονών."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Κατασκευαστής</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1357,28 +1361,30 @@ msgstr ""
 "τον τύπο της, μπορείτε να την επιλέξετε από τη λίστα δέντρου επιλέγοντας ανά:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "το όνομα του μοντέλου της οθόνης"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "την περιγραφή της οθόνης"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Γενικού τύπου</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Επιλέγοντας αυτήν την ομάδα θα εμφανιστούν γύρω στις 30 διαμορφώσεις οθονών "
 "όπως 1024x768 @ 60Hz συμπεριλαμβάνονται και οι οθόνες Flat των φορητών "
@@ -1388,12 +1394,12 @@ msgstr ""
 "είστε συντηρητικοί στις επιλογές σας."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1404,12 +1410,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Αν επιθυμείτε να χρησιμοποιήσετε κρυπτογράφηση σε κάποια από τις κατατμήσεις "
 "σας σιγουρευτείτε ότι έχετε μια ξεχωριστή κατάτμηση /boot. Η επιλογή "
@@ -1417,11 +1425,12 @@ msgstr ""
 "δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Εδώ μπορείτε να ρυθμίσετε τη διάταξη των δίσκων σας. Μπορείτε να αφαιρέσετε "
 "ή να δημιουργήσετε κατατμήσεις, να αλλάξετε το σύστημα αρχείων μιας "
@@ -1429,32 +1438,32 @@ msgstr ""
 "περιεχόμενό της πριν να ξεκινήσετε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Υπάρχει μια καρτέλα για κάθε εντοπισμένο σκληρό δίσκο ή άλλη συσκευή "
-"αποθήκευσης, όπως ένα stick USB. Για παράδειγμα sda, sdb και sdc αν υπάρχουν "
-"τρία από αυτά."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Κάντε κλικ στο <guibutton>Καθαρισμός όλων</guibutton> για να καθαρίσετε όλες "
 "τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Για όλες τις υπόλοιπες ενέργειες: κάντε κλικ στην επιθυμητή κατάτμηση πρώτα. "
 "Στη συνέχεια δείτε την, ή επιλέξτε ένα σύστημα αρχείων και ένα σημείο "
@@ -1464,32 +1473,34 @@ msgstr ""
 "εργαλεία όπως την προσθήκη μιας ετικέτας ή την επιλογή ενός τύπου κατάτμησης."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Συνεχίστε έως ότου ρυθμίσετε οτιδήποτε επιθυμείτε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Αν κάνετε εγκατάσταση της Mageia σε ένα σύστημα UEFI, ελέγξτε ότι μια "
 "κατάτμηση ESP (EFI System Partition) είναι παρούσα και προσαρτημένη σωστά "
 "στο /boot.EFI (δείτε κατωτέρω)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1497,12 +1508,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1511,7 +1522,7 @@ msgstr ""
 "κατάτμηση εκκίνησης BIOS είναι παρούσα και ενός σωστού τύπου"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1524,32 +1535,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Διαμερισμός"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Σε αυτήν την οθόνη μπορείτε να δείτε το περιεχόμενο των σκληρών σας δίσκων "
 "και να δείτε τις λύσεις που βρήκε ο οδηγός διαμερισμού DrakX για τα πιθανά "
 "μέρη εγκατάστασης της <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Οι διαθέσιμες επιλογές από την παρακάτω λίστα ποικίλουν ανάλογα με τις "
 "ιδιότητες των σκληρών σας δίσκων και το περιεχόμενό τους."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1562,12 +1575,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Χρήση των υπαρχουσών κατατμήσεων"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1576,12 +1589,12 @@ msgstr ""
 "συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Χρήση του ελεύθερου χώρου"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1590,12 +1603,12 @@ msgstr ""
 "θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1604,7 +1617,7 @@ msgstr ""
 "οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1614,7 +1627,7 @@ msgstr ""
 "εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1633,12 +1646,14 @@ msgstr ""
 "αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Με αυτήν την επιλογή, ο εγκαταστάτης εμφανίζει την υπολειπόμενη κατάτμηση "
 "των Windows με ανοιχτό κυανό και της επικείμενης κατάτμησης Mageia σε βαθύ "
@@ -1647,37 +1662,39 @@ msgstr ""
 "διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Προσοχή! Αυτή η ενέργεια θα διαγράψει ΟΛΑ τα δεδομένα στον επιλεγμένο σκληρό "
 "δίσκο. Να είστε προσεκτικός-ή!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1688,12 +1705,12 @@ msgstr ""
 "τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1702,76 +1719,89 @@ msgstr ""
 "σας δίσκους."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Το πρόγραμμα εγκατάστασης θα διαμοιράσει τον κοινόχρηστο χώρο βάσει των "
-"ακόλουθων κανόνων:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Αν ο συνολικός διαθέσιμος χώρος είναι λιγότερος από 50GB, θα δημιουργηθεί "
 "μόνο η ριζική κατάτμηση «/» και δεν θα"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Αν ο συνολικά διαθέσιμος χώρος είναι μεγαλύτερος από 50 GB, τότε "
 "δημιουργούνται τρεις κατατμήσεις"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση «/» με "
 "μέγιστο χώρο 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση «swap» με "
 "μέγιστο χώρο 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 "και το υπόλοιπο (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο «/"
 "home» "
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Αυτό σημαίνει πως από τα 160 GB ελεύθερου χώρα και άνω, το πρόγραμμα "
 "εγκατάστασης δημιουργεί τρεις κατατμήσεις: 50 GB για το /, 4 GB για το swap "
 "και το υπόλοιπο για το /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Αν χρησιμοποιείτε ένα σύστημα UEFI, το ESP (EFI System Partition) θα "
 "εντοπιστεί αυτομάτως, η αν δεν υπάρχει θα δημιουργηθεί, και θα προσαρτηθεί "
@@ -1779,13 +1809,14 @@ msgstr ""
 "που επιτρέπει τον έλεγχο επικύρωσης."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Αν χρησιμοποιείτε ένα παλιό σύστημα (γνωστό και ως CSM ή BIOS) με δίσκο GPT, "
 "χρειάζεστε να δημιουργήσετε μια κατάτμηση εκκίνησης Bios αν δεν υφίσταται. "
@@ -1795,7 +1826,7 @@ msgstr ""
 "κατάτμηση εκκίνησης BIOS ως τύπο συστήματος αρχείων."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1806,7 +1837,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1815,15 +1846,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Μερικοί νέοι οδηγοί σκληρών δίσκων χρησιμοποιούν τώρα 4096 byte λογικούς "
 "τομείς, αντί του προηγούμενου στάνταρ των λογικών τομέων 512 byte. Εξαιτίας "
@@ -1835,19 +1867,22 @@ msgstr ""
 "χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Στοίχιση σε\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Σιγουρευτείτε ότι όλες οι κατατμήσεις έχουν δημιουργηθεί με ένα ζυγό αριθμό "
 "Mb."
@@ -1858,7 +1893,7 @@ msgid "Installation from LIVE medium"
 msgstr "Εγκατάσταση από μέσο LIVE"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1873,18 +1908,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Η επίσημη τεκμηρίωση της Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1897,7 +1932,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1909,7 +1944,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1922,13 +1957,13 @@ msgstr ""
 "Documentation_team\">Ομάδα της τεκμηρίωσης</link>."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1940,26 +1975,34 @@ msgstr ""
 "τις επιλογές που κάνετε κατά την εγκατάσταση."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Εγκατάσταση με το DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Φεβρουάριος 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1967,7 +2010,7 @@ msgstr "Συγχαρητήρια"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1976,7 +2019,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1986,17 +2029,18 @@ msgstr ""
 "τώρα να επανεκκινήσετε τον υπολογιστή σας με ασφάλεια."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Μετά την επανεκκίνηση, στην οθόνη του μενού εκκίνησης, μπορείτε να επιλέξετε "
 "μεταξύ των λειτουργικών συστημάτων σας στον υπολογιστή σας (αν έχετε "
 "περισσότερα από ένα)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2005,12 +2049,12 @@ msgstr ""
 "σας της Mageia θα επιλεχθεί αυτόματα και θα εκκινηθεί."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Απολαύστε!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2025,11 +2069,12 @@ msgstr "Τείχος προστασίας"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Αυτή η ενότητα επιτρέπει την διαμόρφωση μερικών απλών κανόνων του τείχους "
 "προστασίας: καθορίζουν τον τύπο των επιτρεπόμενων μηνυμάτων από το διαδίκτυο "
@@ -2038,15 +2083,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Στην εξ ορισμού ρύθμιση δεν υπάρχει κάποιο κουμπί επιλεγμένο. Οι υπηρεσίες "
 "συστήματος δεν είναι προσβάσιμες από το διαδίκτυο. Η επιλογή «<emphasis>Όλα "
@@ -2060,10 +2106,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Όλες οι άλλες επιλογές είναι αυτονόητες. Για παράδειγμα, επιλέξτε το πλαίσιο "
 "ελέγχου «Εξυπηρετητής CUPS» αν θέλετε οι εκτυπωτές σας να είναι "
@@ -2076,12 +2123,11 @@ msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "Το σύνολο αυτό των πλαισίων ελέγχου αφορά μόνο τις βασικές υπηρεσίες. Το "
 "κουμπί «Προχωρημένες» δίνει πρόσβαση σε πιο υπηρεσίες που δεν καλύπτονται "
@@ -2089,12 +2135,12 @@ msgstr ""
 "υπηρεσιών πληκτρολογώντας τες (αφήνοντας κενά μεταξύ τους)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;αριθμός-θύρας>/&lt;πρωτόκολλο></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2105,7 +2151,7 @@ msgstr ""
 "για την υπηρεσία RSYNC) όπως καθορίζεται στο <emphasis>RFC-433</emphasis>·"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2115,7 +2161,7 @@ msgstr ""
 "εκάστοτε υπηρεσίας."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2124,7 +2170,7 @@ msgstr ""
 "υπηρεσία RSYNC είναι η <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2133,7 +2179,7 @@ msgstr ""
 "πρωτόκολλα, θα πρέπει να καθορίσετε 2 ζεύγη για την ίδια θύρα."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
@@ -2142,41 +2188,42 @@ msgstr "Μορφοποίηση"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Εδώ μπορείτε να επιλέξετε ποιες κατατμήσεις επιθυμείτε να μορφοποιήσετε. Τα "
 "δεδομένα στις κατατμήσεις που <emphasis>δεν</emphasis> έχουν σημειωθεί για "
 "μορφοποίηση θα διατηρηθούν."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Συνήθως τουλάχιστον οι κατατμήσεις που έχει επιλέξει το DrakX, χρειάζεται να "
 "μορφοποιηθούν"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2186,12 +2233,13 @@ msgstr ""
 "<emphasis>χαλασμένα τμήματα</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Αν δεν είστε σίγουρος-η ότι έχετε κάνει την σωστή επιλογή, μπορείτε να "
 "κάνετε κλικ στο <guibutton>Προηγούμενο</guibutton>, ξανά στο "
@@ -2201,7 +2249,7 @@ msgstr ""
 "σας."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2210,12 +2258,12 @@ msgstr ""
 "guibutton> για να συνεχίσετε."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2227,7 +2275,7 @@ msgstr ""
 "ευκολότερα."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2236,36 +2284,40 @@ msgstr ""
 "εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Χρήση ενός DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Αυτές είναι οι εξ ορισμού οθόνες καλωσορίσματος κατά τη χρήση ενός Mageia "
 "DVD· η πρώτη με ένα σύστημα UEFI και η δεύτερη με ένα παλαιό σύστημα:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Μπορείτε να προσπελάσετε τις επιλογές από αυτήν την οθόνη πατώντας το «e» "
 "για να εισέλθετε στην λειτουργία επεξεργασίας. Για να επιστρέψετε, πιέστε "
@@ -2273,120 +2325,114 @@ msgstr ""
 "το «F10» για εγκατάλειψη με αποθήκευση."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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:45
+#: 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 ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Η γλώσσα (για την εγκατάσταση μόνο, μπορεί να είναι διαφορετική από τη "
-"γλώσσα του συστήματος) πατώντας το πλήκτρο F2 (μόνο σε λειτουργία παλαιού "
-"τύπου)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr "Χρησιμοποιήστε τα βελάκια για να επιλέξετε τη γλώσσα και πιέστε Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Εδώ φαίνεται για παράδειγμα, η οθόνη υποδοχής στα γαλλικά με Live CD/DVD. "
-"Σημειώστε ότι το μενού του Live CD/DVD δεν προτείνει: <guilabel>Διάσωση του "
-"συστήματος</guilabel>, <guilabel>Έλεγχο μνήμης</guilabel> και το "
-"<guilabel>Εργαλείο εντοπισμού υλικού</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Αλλαγή της ανάλυσης της οθόνης πιέζοντας το πλήκτρο F3 (μόνο σε λειτουργία "
 "παλαιού τύπου)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Προσθέστε μερικές επιλογές του πυρήνα πιέζοντας το πλήκτρο <emphasis role="
-"\"bold\">F6</emphasis> για τη λειτουργία παλαιού τύπου ή το πλήκτρο "
-"<emphasis role=\"bold\">e</emphasis> για τη λειτουργία UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Προκαθορισμένη, δεν αλλάζει καμιά από τις εξ ορισμού επιλογές."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Αν αποτύχει η εγκατάσταση, τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
-"χρησιμοποιώντας μια από τις επιπλέον επιλογές. Το πάτημα του πλήκτρου F6 "
-"εμφανίζει μια νέα γραμμή με τις <guilabel>Επιλογές του πυρήνα</guilabel> και "
-"υπάρχουν διαθέσιμες τέσσερις επιλογές:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Προκαθορισμένη, δεν αλλάζει καμιά από τις εξ ορισμού επιλογές."
+"- Ασφαλές ρυθμίσεις, δίνεται προτεραιότητα στις επισφαλές επιλογές σε βάρος "
+"της απόδοσης."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Χωρίς ACPI : Advanced Configuration and Power Interface, η εξελιγμένη "
 "διεπαφή ρύθμισης και διαχείρισης ενέργειας δεν θα ληφθεί υπόψη."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Χωρίς τοπικό APIC (Local Advanced Programmable Interrupt Controller), ο "
 "προηγμένος προγραμματιζόμενος ελεγκτής διακοπών συστήματος αφορά τις "
 "διακοπές της CPU, επιλέξτε αυτήν την επιλογή αν σας ζητηθεί."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2396,55 +2442,52 @@ msgstr ""
 "guilabel>. "
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Σε μερικές εκδόσεις της Mageia, μπορεί οι επιλογές με το πλήκτρο F6 να μην "
 "εμφανιστούν στην γραμμή <guilabel>Επιλογές εκκίνησης</guilabel>· ωστόσο, "
 "λαμβάνονται κανονικά υπόψη."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Προσθέστε περισσότερες επιλογές του πυρήνα πιέζοντας το πλήκτρο F1 (μόνο σε "
-"λειτουργία παλαιού τύπου)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Πιέζοντας F1 ανοίγει ένα νέο παράθυρο με επιπλέον διαθέσιμες επιλογές. "
 "Επιλέξτε μια με τα βελάκια και πατήστε Enter για περισσότερες λεπτομέρειες ή "
 "πιέστε Esc για να επιστρέψετε στην οθόνη υποδοχής."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Η προβολή λεπτομερειών για την εικόνα εκκίνησης. Πατήστε Esc ή επιλέξτε "
 "<guilabel>Επιστροφή στις επιλογές εκκίνησης</guilabel> για να επιστρέψετε "
@@ -2452,20 +2495,23 @@ msgstr ""
 "στη γραμμή <guilabel>Επιλογές εκκίνησης</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "Η Βοήθεια εμφανίζεται μεταφρασμένη στην επιλεγμένη γλώσσα με το πλήκτρο F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2476,82 +2522,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Χρήση ενός ενσύρματου δικτύου"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Αυτή είναι η εξ ορισμού οθόνη καλωσορίσματος όταν χρησιμοποιείτε ένα CD "
-"εγκατάστασης ενσύρματου δικτύου (εικόνες netinstall.iso ή netinstall-nonfree."
-"iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Δεν επιτρέπει την αλλαγή της γλώσσας, οι διαθέσιμες επιλογές περιγράφονται "
-"στην οθόνη. Για περισσότερες πληροφορίες σχετικά με τη χρήση ενός CD "
-"εγκατάστασης ενσύρματου δικτύου, ανατρέξτε στο <link ns2:href=\"https://wiki."
-"mageia.org/en/Boot.iso_install\">Wiki της Mageia</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Η διάταξη του πληκτρολογίου είναι η αμερικανική."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Τα βήματα εγκατάστασης"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Η διεργασία της εγκατάστασης είναι διαχωρισμένη σε μια σειρά βημάτων, τα "
 "οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα της οθόνης."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Κάθε βήμα έχει μια ή περισσότερες οθόνες οι οποίες μπορεί να διαθέτουν "
 "κουμπιά για <guibutton>Προχωρημένες</guibutton> ρυθμίσεις, τις οποίες "
 "συνήθως δεν θα χρειαστεί να επιλέξετε."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Οι περισσότερες οθόνες διαθέτουν κουμπιά <guibutton>βοήθειας</guibutton> "
 "όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2571,17 +2583,17 @@ msgstr ""
 "επανεκκίνηση."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2593,13 +2605,16 @@ msgstr ""
 "<code>vgalo</code> στην προτροπή."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Αν πρόκειται για πολύ παλιό υλικό, ίσως η εγκατάσταση σε γραφικό περιβάλλον "
 "να είναι αδύνατη. Σε αυτή την περίπτωση μπορείτε να δοκιμάσετε την "
@@ -2609,12 +2624,12 @@ msgstr ""
 "Τώρα συνεχίστε την εγκατάσταση σε λειτουργία κειμένου."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Πάγωμα της εγκατάστασης"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2630,14 +2645,15 @@ msgstr ""
 "κριθεί απαραίτητο."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Πρόβλημα RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2649,18 +2665,20 @@ msgstr ""
 "καθορίζει 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Δυναμικές κατατμήσεις"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Αν μετατρέψατε τον σκληρό σας δίσκο από «βασική» σε «δυναμική» μορφή σε "
 "Microsoft Windows, θα πρέπει να γνωρίζετε ότι είναι αδύνατο να εγκαταστήσετε "
@@ -2679,18 +2697,18 @@ msgstr "Ενημερώσεις"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2699,10 +2717,11 @@ msgstr ""
 "application>, μερικά πακέτα έχουν ενημερωθεί ή βελτιωθεί."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Επιλέξτε <guilabel>ναι</guilabel> αν επιθυμείτε να κάνετε λήψη και να "
@@ -2711,8 +2730,9 @@ msgstr ""
 "διαδίκτυο."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Έπειτα κάντε κλικ στο <guibutton>Επόμενο</guibutton> για να συνεχίσετε"
 
 #. type: Content of: <section><info><title>
@@ -2769,18 +2789,18 @@ msgstr "Επιλογή μέσων (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2793,7 +2813,7 @@ msgstr ""
 "επόμενα βήματα της εγκατάστασης."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2802,7 +2822,7 @@ msgstr ""
 "περιέχει τη βάση της διανομής."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2818,13 +2838,14 @@ msgstr ""
 "κλπ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Το αποθετήριο <emphasis>Tainted</emphasis> περιέχει πακέτα τα οποία "
 "διαθέτουν μια ελεύθερη άδεια. Ο κύριος λόγος που αυτά τα πακέτα βρίσκονται "
@@ -2834,38 +2855,41 @@ msgstr ""
 "απαιτούνται για την αναπαραγωγή εμπορικών βίντεο DVD, κλπ."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Ελάχιστη εγκατάσταση"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Μπορείτε να επιλέξετε την Ελάχιστη εγκατάσταση αποεπιλέγοντας τα πάντα στην "
 "οθόνη επιλογής Ομάδων πακέτων, δείτε <xref linkend=\"choosePackageGroups\"></"
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Αν το επιθυμείτε μπορείτε να επιλέξετε την «επιλογή μεμονωμένων πακέτων» "
 "στην ίδια οθόνη."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Η Ελάχιστη εγκατάσταση προορίζεται για αυτούς που θέλουν να κάνουν μια "
 "ειδική χρήση της Mageia, όπως ένας εξυπηρετητής ή έναν εξειδικευμένο σταθμό "
@@ -2874,9 +2898,10 @@ msgstr ""
 "\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Αν επιλέξετε αυτήν την επιλογή εγκατάστασης, τότε στην επόμενη οθόνη θα "
@@ -2884,16 +2909,14 @@ msgstr ""
 "όπως τεκμηρίωση και X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Αν επιλέξετε «με X» θα συμπεριληφθεί επίσης ο διαχειριστής παραθύρων IceWM "
-"ως ένα ελαφρύ περιβάλλον εργασίας."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2908,15 +2931,15 @@ msgstr ""
 "coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2933,11 +2956,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "Το DrakX πραγματοποίησε έξυπνες επιλογές για την διαμόρφωση του συστήματός "
 "σας, ανάλογα με τις επιλογές που κάνατε προηγουμένως και το υλικό που "
@@ -2946,9 +2970,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Ως γενικός κανόνας, συνιστώνται οι προεπιλεγμένες ρυθμίσεις και μπορείτε να "
 "τις διατηρήσετε με 3 εξαιρέσεις:"
@@ -2965,74 +2990,78 @@ msgstr "η εξορισμού ρύθμιση έχει ήδη δοκιμαστε�
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "κάποια άλλη πληροφορία υπάρχει στις αναλυτικές ενότητες κατωτέρω"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Παράμετροι του συστήματος"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Ζώνη ώρας:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "Το DrakX επέλεξε μια ζώνη ώρας για εσάς, ανάλογα με την προτιμώμενη γλώσσα. "
 "Αν χρειάζεται μπορείτε να την αλλάξετε. Δείτε επίσης <xref linkend="
 "\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Χώρα / Περιοχή:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Αν δεν είσαστε στην επιλεγμένη χώρα, είναι πολύ σημαντικό να διορθώσετε τη "
 "ρύθμιση.  Δείτε <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Πρόγραμμα εκκίνησης:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "Το DrakX έχει πραγματοποιήσει καλές επιλογές για τη ρύθμιση του προγράμματος "
 "εκκίνησης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Μην αλλάξετε τίποτα, αν δεν γνωρίζετε πως να διαμορφώσετε το Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"setupBootloader\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Διαχείριση χρηστών:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3041,22 +3070,23 @@ msgstr ""
 "του κατάλογο <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Υπηρεσίες</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Οι υπηρεσίες συστήματος είναι αυτά τα μικρά προγράμματα που εκτελούνται στο "
 "παρασκήνιο (δαίμονες). Αυτό το εργαλείο σας επιτρέπει την ενεργοποίηση ή την "
 "απενεργοποίηση ορισμένων εργασιών."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3065,33 +3095,34 @@ msgstr ""
 "μπορεί να προκαλέσει τη δυσλειτουργία του υπολογιστή σας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Παράμετροι υλικού"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Πληκτρολόγιο:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Εδώ είναι το μέρος που ρυθμίζετε ή αλλάζετε τη διάταξη του πληκτρολογίου ή "
 "οποία εξαρτάται από την τοποθεσία σας, τη γλώσσα ή τον τύπο του "
 "πληκτρολογίου."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3100,12 +3131,12 @@ msgstr ""
 "αλλάξετε, λάβετε υπόψη ότι ο κωδικός πρόσβασης θα αλλάξει επίσης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ποντίκι</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3114,16 +3145,17 @@ msgstr ""
 "ταμπλέτες, σφαιροδείκτες κλπ."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Κάρτα ήχου</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Το πρόγραμμα εγκατάστασης χρησιμοποιεί τον προκαθορισμένο οδηγό, αν έχει "
 "καθοριστεί κάποιος. Η δυνατότητα επιλογής ενός διαφορετικού οδηγού δίνεται "
@@ -3131,26 +3163,26 @@ msgstr ""
 "αυτούς δεν είναι ο προκαθορισμένος."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Κάρτα γραφικών</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Αυτή η ενότητα σας επιτρέπει να διαμορφώσετε την κάρτα γραφικών σας και τις "
 "οθόνες σας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureX_chooser\"></"
 "xref>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3159,20 +3191,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Παράμετροι δικτύου και διαδικτύου"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Δίκτυο</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3182,21 +3215,22 @@ msgstr ""
 "τα αποθετήρια «nonfree»."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Όταν προσθέτετε μια κάρτα δικτύου, μην ξεχάσετε να διαμορφώσετε το τοίχος "
 "προστασίας για την εποπτεία των επαφών αυτών."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Διαμεσολαβητές</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3207,26 +3241,27 @@ msgstr ""
 "υπολογιστή σας για την χρήση μιας υπηρεσίας διαμεσολαβητή."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Ίσως χρειάζεται να συμβουλευτείτε τον διαχειριστή των συστημάτων σας για να "
 "λάβετε τις παραμέτρους που χρειάζεστε να εισάγετε εδώ"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Ασφάλεια"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Επίπεδο ασφάλειας</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3236,17 +3271,17 @@ msgstr ""
 "καταλληλότερο για γενική χρήση."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Επιλέξτε την επιλογή που ταιριάζει περισσότερο με τη χρήση σας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Τείχος προστασίας</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3256,7 +3291,7 @@ msgstr ""
 "εκθέσουν ή να τα κλέψουν."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3268,7 +3303,7 @@ msgstr ""
 "\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Έχετε υπόψη σας ότι επιτρέποντας τα πάντα (χωρίς τείχος προστασίας) μπορεί "
@@ -3340,41 +3375,74 @@ msgstr ""
 "χώρος για την εγκατάσταση της <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Επίπεδο ασφάλειας"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Εδώ μπορείτε να ρυθμίσετε το επίπεδο ασφαλείας."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Προχωρημένες</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"Αφήστε τις προκαθορισμένες ρυθμίσεις ως έχουν, αν δεν γνωρίζετε τι να "
-"επιλέξετε."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Μετά την εγκατάσταση, είναι δυνατό να ρυθμίσετε τις ρυθμίσεις ασφάλειας από "
 "την ενότητα <guilabel>Ασφάλεια</guilabel> του Κέντρου Ελέγχου Mageia."
@@ -3391,25 +3459,27 @@ msgstr "Εισαγωγή"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Η Mageia διανέμεται μέσω εικόνων ISO. Αυτή η σελίδα θα σας βοηθήσει να "
 "επιλέξετε ποια εικόνα ταιριάζει στις ανάγκες σας."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Υπάρχουν δυο οικογένειες μέσων:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Κλασσικός εγκαταστάτης: Μετά την εκκίνηση του μέσου, ακολουθεί μια "
 "διαδικασία που επιτρέπει την προσαρμογή της εγκατάστασης  και τον τρόπο "
@@ -3418,84 +3488,87 @@ msgstr ""
 "εργασίας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Μέσο LIVE: Μπορείτε να εκκινήσετε το μέσο πάνω σε ένα πραγματικό σύστημα "
-"Mageia χωρίς να το εγκαταστήσετε ούτως ώστε να διαπιστώσετε τι θα έχετε μετά "
-"την ενδεχόμενη εγκατάσταση. Η διαδικασία της εγκατάστασης είναι ευκολότερη "
-"αλλά με λιγότερες επιλογές."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Στις επόμενες ενότητες δίνονται περισσότερες πληροφορίες."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Μέσα"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Ορισμός"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Μέσο αποκαλούμε εδώ ένα αρχείο εικόνας ISO το οποίο επιτρέπει την "
 "εγκατάσταση και/ή την ενημέρωση της Mageia και κατ' επέκταση κάθε φυσικό "
 "μέσο όπου το αρχείο ISO έχει αντιγραφεί."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Μπορείτε να τα βρείτε <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">εδώ</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Μέσο κλασσικής εγκατάστασης"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Κοινά χαρακτηριστικά"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Τα ISO χρησιμοποιούν το παραδοσιακό πρόγραμμα εγκαταστάτης drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Μπορούν να πραγματοποιήσουν μια «καθαρή» εγκατάσταση ή να ενημερώσουν μια "
 "προηγούμενη έκδοση."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 δυφίων."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3504,113 +3577,118 @@ msgstr ""
 "Έλεγχος της μνήμης, Εργαλείο εντοπισμού υλικού."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Κάθε DVD περιέχει πολλά διαθέσιμα γραφικά περιβάλλοντα και γλώσσες."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Κατά την εγκατάσταση θα ερωτηθείτε για την προσθήκη ιδιόκτητου λογισμικού."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Μέσο Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Μπορεί να χρησιμοποιηθεί για την προεπισκόπηση της διανομής χωρίς να γίνει "
 "εγκατάσταση στον σκληρό δίσκο, και προαιρετικά για τη μετέπειτα εγκατάσταση "
 "στον σκληρό δίσκο."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Κάθε ISO περιέχει μόνο ένα περιβάλλον εργασίας (Plasma, GNOME ή XFCE)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Το ISO Live μπορεί να χρησιμοποιηθεί μόνο για μια "
 "«καθαρή» εγκατάσταση· δεν μπορεί να χρησιμοποιηθεί για την αναβάθμιση από "
 "προηγούμενη έκδοση.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Περιέχουν ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Ζωντανό DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Περιέχονται όλες οι γλώσσες."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Μόνο 64 δυφίων αρχιτεκτονική."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Μόνο 64 δυφίων αρχιτεκτονική"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Ζωντανό DVD XFCE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας XFCE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "Αρχιτεκτονική 32 ή 64 δυφίων."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "CD αποκλειστικά για εκκίνηση"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3623,11 +3701,12 @@ msgstr ""
 "διαδίκτυο."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Αυτά τα μέσα είναι πολύ ελαφριά (μικρότερα από 100 MB) και εξυπηρετούν όταν "
 "το εύρος ζώνης είναι πολύ μικρό για τη λήψη ενός πλήρους DVD, όταν ο "
@@ -3635,17 +3714,18 @@ msgstr ""
 "εκκίνηση από ένα κλειδί USB. "
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Μόνο Αγγλική γλώσσα."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3679,11 +3759,12 @@ msgstr "Λήψη"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Αφού έχετε επιλέξει το αρχείο ISO, μπορείτε να το λάβετε είτε μέσω http "
 "πρωτοκόλλου είτε μέσω BitTorrent. Και στις δυο περιπτώσεις, θα ανοίξει ένα "
@@ -3698,10 +3779,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "Τα md5sum και sha1sum είναι εργαλεία ελέγχου της ακεραιότητας των ISO. Η "
 "χρήση ενός εκ των δυο αρκεί. Κρατήστε το για <link linkend=\"integrity"
@@ -3714,8 +3796,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Επιλέξτε το κουμπί επιλογών Αποθήκευση του αρχείου."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3723,14 +3805,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Έλεγχος της ακεραιότητας του ληφθέντος αρχείου"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Και τα δυο εργαλεία ελέγχου της ακεραιότητας είναι δεκαεξαδικοί αριθμοί "
 "αποτέλεσμα υπολογισμού ενός αλγόριθμου από το αρχείο προς τηλεφόρτωση. Όταν "
@@ -3740,69 +3823,84 @@ msgstr ""
 "προσπαθήσετε την εκ νέου λήψη του αρχείου ή την επισκευή μέσω Bittorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Ανοίξτε ένα τερματικό －δεν χρειάζεται σύνδεση ως root － και:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Για χρήση του md5sum, πληκτρολογήστε: [sam@localhost]$ <userinput>md5sum "
 "path/to/the/image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Για χρήση του sha1sum, πληκτρολογήστε: [sam@localhost]$ <userinput>mdsum "
 "path/to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"και συγκρίνετε τον υπολογισμένο αριθμό στον υπολογιστή σας (ίσως χρειαστεί "
-"να περιμένετε λίγο) με τον αριθμό που δίνεται από τη Mageia. Για παράδειγμα:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"και συγκρίνετε τον υπολογισμένο αριθμό στον υπολογιστή σας (ίσως χρειαστεί "
+"να περιμένετε λίγο) με τον αριθμό που δίνεται από τη Mageia. Για παράδειγμα:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Εγγραφή ή αποτύπωση του ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "To επιβεβαιωμένο ISO μπορεί να εγγραφεί σε ένα CD/DVD ή να αποτυπωθεί σε ένα "
 "κλειδί USB. Αυτές οι διεργασίες δεν πρόκειται για μια απλή αντιγραφή και "
 "σκοπεύουν στην δημιουργία ενός εκκινήσιμου μέσου."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Εγγραφή του ISO σε ένα CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Χρησιμοποιήστε το πρόγραμμα εγγραφής που επιθυμείτε, αλλά θα πρέπει να "
 "σιγουρευτείτε ότι η συσκευή εγγραφής έχει διαμορφωθεί σωστά για την "
@@ -3812,12 +3910,12 @@ msgstr ""
 "wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Αποτύπωση του ISO σε ένα κλειδί USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3827,11 +3925,12 @@ msgstr ""
 "και εγκατάσταση του συστήματος."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Η «αποτύπωση» μιας εικόνας σε έναν οδηγό flash θα έχει ως αποτέλεσμα την "
 "διαγραφή των αρχείων και την καταστροφή οποιουδήποτε προηγούμενου συστήματος "
@@ -3839,7 +3938,7 @@ msgstr ""
 "της εικόνας ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3848,12 +3947,12 @@ msgstr ""
 "νέου την κατάτμηση και την μορφοποίηση του κλειδιού USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στην Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3863,74 +3962,73 @@ msgstr ""
 "IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στα Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Μπορείτε να δοκιμάσετε:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- Το <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "χρησιμοποιώντας την επιλογή της «εικόνας ISO»·"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- Το <link ns4:href=\"http://sourceforge.net/projects/win32diskimager"
 "\">Win32 Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Χρήση της γραμμής εντολών σε ένα σύστημα GNU/Linux "
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Είναι εν δυνάμει «επικίνδυνο» να το πραγματοποιήσετε χειροκίνητα. "
 "Διακινδυνεύετε να αντικαταστήσετε μια κατάτμηση του δίσκου αν λάβετε "
 "λανθασμένα το αναγνωριστικό της συσκευής."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Μπορείτε επίσης να χρησιμοποιήσετε το εργαλείο dd σε ένα τερματικό:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Ανοίξτε ένα τερματικό"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Συνδεθείτε ως διαχειριστής με την εντολή <userinput>su -</userinput> (μην "
 "ξεχάσετε το τελικό «-» )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3940,28 +4038,41 @@ msgstr ""
 "κλειδί)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Εισάγετε την εντολή <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Αναζητήστε το όνομα της συσκευής του κλειδιού USB (βάσει του μεγέθους του), "
+"για παράδειγμα <code>/dev/sdb</code> στο παραπάνω στιγμιότυπο· πρόκειται για "
+"ένα κλειδί USB 8GB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Εναλλακτικά, μπορείτε να λάβετε το όνομα της συσκευής μέσω της εντολής "
 "<code>dmesg</code>: στο τέλος θα βρείτε το όνομα της συσκευής αρχίζοντας από "
 "<emphasis>sd</emphasis>, και <emphasis>sdd</emphasis> στην περίπτωσή μας:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4003,47 +4114,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Αναζητήστε το όνομα της συσκευής του κλειδιού USB (βάσει του μεγέθους του), "
-"για παράδειγμα <code>/dev/sdb</code> στο παραπάνω στιγμιότυπο· πρόκειται για "
-"ένα κλειδί USB 8GB."
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Εισάγετε την εντολή: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Όπου «X» = το όνομα της συσκευής, πχ: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Παράδειγμα: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Εισάγετε την εντολή: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Αποσυνδέστε το κλειδί USB, όλα ολοκληρώθηκαν"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4072,9 +4191,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Αν η χώρα σας δεν εμφανίζεται στη λίστα, κάντε κλικ στο κουμπί <emphasis "
 "role=\"bold\">Άλλες χώρες</emphasis> και από εκεί επιλέξτε τη χώρα ή την "
@@ -4082,10 +4202,11 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Αν η χώρα σας εμφανίζεται μόνο στη λίστα <emphasis role=\"bold\">Άλλες "
@@ -4095,18 +4216,19 @@ msgstr ""
 "πραγματική σας επιλογή."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Μέθοδος εισαγωγής"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Στην οθόνη <guilabel>Άλλες χώρες</guilabel> μπορείτε επίσης να επιλέξετε μια "
@@ -4119,11 +4241,13 @@ msgstr ""
 "πριν την επιλογή των πακέτων."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Αν παραλείψατε τη ρύθμιση της μεθόδου εισαγωγής κατά την εγκατάσταση, "
 "μπορείτε να μεταβείτε εκ νέου σε αυτή μετά την επανεκκίνηση του "
@@ -4131,56 +4255,54 @@ msgstr ""
 "> «Σύστημα», ή εκτελώντας localedrake ως root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Εγκατάσταση ή αναβάθμιση"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Εγκατάσταση"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Χρησιμοποιήστε αυτή την επιλογή για μια νέα εγκατάσταση <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Αναβάθμιση"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Αν έχετε μια ή περισσότερες εγκαταστάσεις της <application>Mageia</"
-"application> στο σύστημά σας, ο οδηγός εγκατάστασης θα σας επιτρέψει να "
-"αναβαθμίσετε μια από αυτές στην τελευταία έκδοση."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Έχει δοκιμαστεί μόνο η αναβάθμιση από μια, <emphasis>ακόμα υποστηριζόμενη</"
 "emphasis>, προηγούμενη έκδοση της Mageia όταν κυκλοφόρησε η συγκεκριμένη "
@@ -4190,16 +4312,17 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Αν κάποια στιγμή κατά την εγκατάσταση αποφασίσετε να διακόψετε την "
 "εγκατάσταση, η επανεκκίνηση είναι εφικτή, αλλά σκεφτείτε πολύ καλά πριν το "
@@ -4213,12 +4336,14 @@ msgstr ""
 "επανεκκίνηση."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Αν ανακαλύψετε ότι ξεχάσατε να επιλέξετε μια επιπλέον γλώσσα, μπορείτε να "
 "επιστρέψετε από την οθόνη «Εγκατάσταση ή Αναβάθμιση» στην οθόνη επιλογής "
@@ -4253,12 +4378,12 @@ msgstr ""
 "βάσει της γλώσσας και της ωρολογιακής ζώνης που επιλέξατε προηγουμένως."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Πληκτρολόγιο"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4268,16 +4393,17 @@ msgstr ""
 "Π.Α."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4295,23 +4421,25 @@ msgstr ""
 "Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Αν το πληκτρολόγιό σας δεν βρίσκεται στη λίστα, κάντε κλικ στο "
 "<guibutton>Περισσότερα</guibutton> για να δείτε την πλήρη λίστα, και "
 "επιλέξτε το πληκτρολόγιό σας από εκεί."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Μετά την επιλογή ενός πληκτρολογίου από το διάλογο <guibutton>Περισσότερα</"
 "guibutton>, θα επιστρέψετε στον πρώτο διάλογο επιλογής πληκτρολογίου και θα "
@@ -4320,11 +4448,12 @@ msgstr ""
 "Το πληκτρολόγιό σας είναι αυτό που επιλέξατε από την πλήρη λίστα."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Αν επιλέξετε ένα πληκτρολόγιο βασισμένο σε μη λατινικούς χαρακτήρες, θα "
 "δείτε έναν επιπλέον διάλογο στον οποίο θα ερωτηθείτε πως επιθυμείτε να "
@@ -4332,12 +4461,12 @@ msgstr ""
 "του μη λατινικού."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Παρακαλώ επιλέξτε τη γλώσσα που θα χρησιμοποιηθεί"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4348,7 +4477,7 @@ msgstr ""
 "για τον οδηγό εγκατάστασης και για το εγκατεστημένο σύστημα."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4358,12 +4487,13 @@ msgstr ""
 "εγκατεστημένο σύστημα."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Αν υπάρχει πιθανότητα να χρειαστείτε περισσότερες γλώσσες εγκατεστημένες στο "
 "σύστημά σας, για εσάς ή για άλλους χρήστες, τότε θα πρέπει να "
@@ -4372,7 +4502,7 @@ msgstr ""
 "γλωσσών με αυτόματο τρόπο μετά την εγκατάσταση."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4385,18 +4515,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Παρόλο την επιλογή περισσοτέρων γλωσσών, θα πρέπει να επιλέξετε μια από "
 "αυτές ως την προτιμώμενη γλώσσα στην πρώτη οθόνη επιλογής γλώσσας. Θα "
 "σημειωθεί επίσης ως επιλεγμένη στην οθόνη πολλαπλών γλωσσών ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4406,23 +4537,24 @@ msgstr ""
 "πληκτρολογίου σας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Η Mageia χρησιμοποιεί εξ ορισμού την υποστήριξη UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Αυτό μπορεί να απενεργοποιηθεί στην οθόνη «Πολλαπλές γλώσσες» αν γνωρίζετε "
 "ότι δεν είναι κατάλληλο για τη γλώσσα σας. Η απενεργοποίηση της υποστήριξης "
 "UTF-8 θα εφαρμοστεί σε όλες τις γλώσσες."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4478,69 +4610,74 @@ msgstr ""
 "έξι ή περισσότερα κουμπιά."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Για να τοπ κάνετε αυτό θα πρέπει να επεξεργαστείτε χειροκίνητα το /boot/"
 "grub2/custom.cfg ή να χρησιμοποιήσετε το λογισμικό grub-customizer "
 "(Διαθέσιμο στα αποθετήρια της Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Για περισσότερες πληροφορίες ανατρέξτε στο wiki μας <link ns2:href=\"https://"
 "wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Διεπαφή του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Εξ ορισμού η Mageia χρησιμοποιεί αποκλειστικά:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr "Grub2 (με ή χωρίς γραφικό περιβάλλον) για παλιά συστήματα MBR/GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi για ένα σύστημα UEFI"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Τα γραφικά μενού της Mageia είναι πολύ όμορφα:)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 σε παλιό σύστημα με MBR/GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4553,29 +4690,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Μην τροποποιήσετε το περιφερειακό εκκίνησης εκτός και αν γνωρίζεται τι "
 "ακριβώς πράττετε."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2 σε συστήματα UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Με ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς διαφορετικό όπως ότι "
 "δεν μπορείτε να επιλέξετε με ή χωρίς γραφικό περιβάλλον"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4588,14 +4730,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Αν η Mageia είναι το μοναδικό σύστημα εγκατεστημένο στον υπολογιστή σας, το "
@@ -4608,36 +4751,41 @@ msgstr ""
 "αριθμού των λειτουργικών συστημάτων που διαθέτετε."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Εξ ορισμού, αναλόγως με το σύστημά σας, η Mageia δημιουργεί ένα νέο:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "Ένα πρόγραμμα εκκίνησης GRUB2 είτε στο MBR (Master Boot Record) του πρώτου "
 "σκληρού δίσκου ή στην κατάτμηση εκκίνησης του BIOS."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Ένα πρόγραμμα εκκίνησης Grub2-efi στο ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Αν έχετε και άλλα λειτουργικά συστήματα εγκατεστημένα, η Mageia προσπαθεί να "
 "τα προσθέσει στο νέο μενού εκκίνησης Mageia. Αν δεν το επιθυμείτε, κάντε "
@@ -4645,7 +4793,7 @@ msgstr ""
 "<guilabel>Εντοπισμός ξένου λειτουργικού</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4658,18 +4806,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον "
 "πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν τη Βοήθεια, ωστόσο "
@@ -4679,16 +4828,17 @@ msgstr ""
 "εν λόγω λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Χρήση αλυσιδωτής φόρτωσης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Αν δεν επιθυμείτε μια εκκινήσιμη Mageia, αλλά την αλυσιδωτή φόρτωση από άλλο "
 "λειτουργικό σύστημα, κάντε κλικ στο <guibutton>Επόμενο</guibutton>, και στο "
@@ -4696,7 +4846,7 @@ msgstr ""
 "αγγίξεις το ESP ή το MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4709,7 +4859,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4718,7 +4868,7 @@ msgstr ""
 "το με κλικ στο <guibutton>Εντάξει</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4727,33 +4877,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Επιλογές"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Πρώτη σελίδα"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Καθυστέρηση πριν την εκκίνηση της προεπιλεγμένης εικόνας</"
 "guilabel>: Το πλαίσιο κειμένου σας επιτρέπει τον ορισμό μιας καθυστέρησης σε "
 "δευτερόλεπτα πριν την εκκίνηση του εξ ορισμού λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Ασφάλεια</guilabel>: Σας επιτρέπει τον ορισμό ενός κωδικού "
 "πρόσβασης για το πρόγραμμα εκκίνησης. Αυτό σημαίνει ότι κατά την εκκίνηση θα "
@@ -4762,37 +4913,37 @@ msgstr ""
 "«root»  και ο κωδικός πρόσβασης είναι αυτός που θα επιλέξετε εδώ."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Κωδικός πρόσβασης</guilabel>: Εδώ εισαγάγετε τον κωδικό πρόσβασης"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε την πληκτρολόγηση "
 "του κωδικού πρόσβασης και το Drakx θα ελέγξει αν ο κωδικός πρόσβασης "
 "ταιριάζει με τον ανωτέρω."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Προηγμένες</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Ενεργοποίηση του ACPI:</guilabel> Το ACPI (Advanced Configuration "
 "and Power Interface - Εξελιγμένη διεπαφή ρύθμισης και διαχείρισης ενέργειας) "
@@ -4804,21 +4955,22 @@ msgstr ""
 "επανεκκινήσεις ή κωλύματα του συστήματος)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Ενεργοποίηση του SMP</guilabel>: Αυτή η επιλογή (απ)ενεργοποιεί "
 "την συμμετρική πολυδιεργασία για επεξεργαστές πολλαπλών πυρήνων. "
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Ενεργοποίηση του APIC</guilabel>: (απ)ενεργοποιώντας το δίνεται "
 "στο λειτουργικό σύστημα πρόσβαση στον προηγμένο προγραμματιζόμενο ελεγκτή "
@@ -4827,29 +4979,30 @@ msgstr ""
 "(Αιτήσεις διακοπτών)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Ενεργοποίηση τοπικού APIC</guilabel>: Εδώ μπορείτε να ορίσετε το "
 "τοπικό APIC, το οποίο διαχειρίζεται όλους τους εξωτερικούς διακόπτες για "
 "μερικούς εξειδικευμένους επεξεργαστές σε ένα σύστημα SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Επόμενη σελίδα"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Εξ ορισμού:</guilabel> Το λειτουργικό σύστημα που εκκινείται εξ "
 "ορισμού"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4859,7 +5012,7 @@ msgstr ""
 "περισσότερες πληροφορίες κατά την εκκίνηση."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4869,18 +5022,19 @@ msgstr ""
 "εκκίνησης Mageia</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Λειτουργία βίντεο</guilabel>: Ορίζει το μέγεθος της οθόνης και το "
 "χρωματικό βάθος που θα χρησιμοποιεί το πρόγραμμα εκκίνησης. Αν κάνετε κλικ "
 "στο κάτω τρίγωνο θα εμφανιστούν οι επιλογές μεγέθους και χρωματικού βάθους."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4890,7 +5044,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Διαμόρφωση SCSI"
 
@@ -4903,36 +5057,39 @@ msgstr "Διαμόρφωση SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "Το DrakX συνήθως εντοπίζει τους σκληρούς σας δίσκους σωστά. Ωστόσο, μπορεί "
 "να αποτύχει στον εντοπισμό ορισμένων παλαιότερων ελεγκτών οδηγών SCSI με "
 "αποτέλεσμα να αποτύχει η εγκατάσταση των απαραίτητων οδηγών."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Αν συμβαίνει αυτό, θα πρέπει να δηλώσετε χειροκίνητα στο Drakx τους οδηγούς "
 "SCSI που διαθέτετε."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "Στη συνέχεια, το DrakX θα πρέπει να είναι σε θέση να αναγνωρίσει ποιες "
@@ -4956,10 +5113,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Σε αυτήν την οθόνη δίνεται το όνομα του οδηγού που έχει επιλέξει ο "
 "εγκαταστάτης για την κάρτα ήχου, ο οποίος θα είναι και ο εξ' ορισμού οδηγός "
@@ -4983,10 +5140,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Στη συνέχεια, στην οθόνη του εργαλείου draksound ή «Διαμόρφωση του ήχου», "
 "κάντε κλικ στο <guibutton>Για προχωρημένους</guibutton> και στη συνέχεια στο "
@@ -4994,16 +5153,18 @@ msgstr ""
 "πληροφορίες επίλυσης του προβλήματος."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Με κλικ στο <guibutton>Για προχωρημένους</guibutton> στην οθόνη αυτή, κατά "
 "την εγκατάσταση, μπορεί να φανεί χρήσιμο στην περίπτωση που υπάρχουν "
@@ -5011,16 +5172,17 @@ msgstr ""
 "οδηγός, ή πιστεύετε ότι ο εγκαταστάτης επέλεξε έναν λανθασμένα. "
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Σε αυτήν την περίπτωση μπορείτε να επιλέξετε έναν διαφορετικό οδηγό με κλικ "
 "στο <guibutton>Επιλογή οδηγού</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Επιβεβαίωση του σκληρού δίσκου προς μορφοποίηση"
 
@@ -5031,13 +5193,13 @@ msgstr "Επιβεβαίωση του σκληρού δίσκου προς μο�
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -5047,18 +5209,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Κάντε κλικ στο <guibutton>Προηγούμενο</guibutton> αν δεν είστε σίγουρος-η "
 "για το σκληρό δίσκο που επιλέξατε."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Κάντε κλικ στο <guibutton>Επόμενο</guibutton> αν είστε σίγουρος-η και "
 "επιθυμείτε την διαγραφή όλων των κατατμήσεων, όλων των λειτουργικών "
@@ -5185,16 +5350,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Απεγκατάσταση της Mageia "
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Οδηγίες"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Αν η Mageia δεν σας «έπεισε» ή αν δεν δεν μπορείτε να την απεγκαταστήσετε "
@@ -5202,28 +5363,30 @@ msgstr ""
 "η Mageia σας δίνει τη δυνατότητα να το κάνετε εν αντιθέσει άλλων "
 "λειτουργικών συστημάτων."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Αφού πραγματοποιήσετε εφεδρικά αντίγραφα, επανεκκινήστε το DVD εγκατάστασης "
 "της Mageia και επιλέξτε Διάσωση του συστήματος. Στη συνέχεια, Επαναφορά του "
 "προγράμματος εκκίνησης των Windows. Στην επόμενη εκκίνηση, θα έχετε μόνο "
 "Windows ως επιλογή."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Για να ανάκτηση του χώρου που χρησιμοποιούσαν οι κατατμήσεις Mageia στα "
 "Windows, κάντε κλικ στο <code>Έναρξη -> Πίνακας ελέγχου -> Εργαλεία "
@@ -5234,8 +5397,8 @@ msgstr ""
 "κατατμήσεις και επιλέξτε <guibutton>Διαγραφή</guibutton>· ο χώρος θα "
 "απελευθερωθεί."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5244,14 +5407,15 @@ msgstr ""
 "και να την μορφοποιήσετε σε (FAT32 ή NTFS). Θα αποκτήσει ένα γράμμα "
 "κατάτμησης."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Αν έχετε Vista ή 7, έχετε ακόμα μια επιλογή, μπορείτε να επεκτείνετε την "
 "υπάρχουσα κατάτμηση που βρίσκεται στα αριστερά από τον απελευθερωμένο χώρο. "
@@ -5307,6 +5471,364 @@ msgstr ""
 "λίγο, είναι κανονικό."
 
 #~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε εδώ την "
+#~ "πληκτρολόγηση του κωδικού πρόσβασης του χρήστη και το drakx θα ελέγξει "
+#~ "ότι έχετε πληκτρολογήσει τον ίδιο κωδικό σε όλα τα πεδία εισαγωγής "
+#~ "κωδικού πρόσβασης του χρήστη."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr ""
+#~ "Επιπροσθέτως, μπορείτε να απενεργοποιήσετε ή να ενεργοποιήσετε ένα "
+#~ "λογαριασμό επισκέπτη."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Οτιδήποτε αποθηκεύει ένας επισκέπτης με τον προκαθορισμένο λογαριασμό "
+#~ "guest <emphasis>rbash</emphasis> στον προσωπικό του κατάλογό /home θα "
+#~ "διαγράφεται. Ο guest θα πρέπει να αποθηκεύει τα σημαντικά του αρχεία σε "
+#~ "ένα stick USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Ενεργοποίηση λογαριασμού guest</guilabel>: Εδώ μπορείτε να "
+#~ "ενεργοποιήσετε ή να απενεργοποιήσετε ένα λογαριασμό επισκέπτη. Ο "
+#~ "λογαριασμός guest επιτρέπει σε έναν επισκέπτη να συνδεθεί και να "
+#~ "χρησιμοποιήσει τον υπολογιστή, αλλά έχει περισσότερη περιορισμένη "
+#~ "πρόσβαση σε σχέση με τους τυπικούς χρήστες."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Αναγνωριστικό ομάδας</guilabel>: Σας επιτρέπει να ορίσετε το ID "
+#~ "της ομάδας. Επίσης πρόκειται για έναν αριθμό, συνήθως ο ίδιος με αυτόν "
+#~ "του χρήστη."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "Η «Συσκευή», συντελείται από: «σκληρός δίσκος», [«αριθμός σκληρού "
+#~ "δίσκου»(γράμμα)], «αριθμός κατάτμησης» (για παράδειγμα, «sda5»)."
+
+#~ msgid "Workstation."
+#~ msgstr "Σταθμός εργασίας."
+
+#~ msgid "Server."
+#~ msgstr "Εξυπηρετητής."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Γραφικό περιβάλλον."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Υπάρχουν τέσσερις ομάδες, κάντε κλικ στο τρίγωνο μπροστά από μια ομάδα "
+#~ "για την ανάπτυξή τους και για να δείτε όλες τις υπηρεσίες σε αυτήν."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Αν δεν μπορείτε να βρείτε την κάρτα σας στη λίστα κατασκευαστών (διότι "
+#~ "δεν βρίσκεται ακόμα στη βάση δεδομένων ή πρόκειται για μια παλιά κάρτα) "
+#~ "ίσως να βρείτε έναν κατάλληλο οδηγό στην κατηγορία Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Υπάρχει μια καρτέλα για κάθε εντοπισμένο σκληρό δίσκο ή άλλη συσκευή "
+#~ "αποθήκευσης, όπως ένα stick USB. Για παράδειγμα sda, sdb και sdc αν "
+#~ "υπάρχουν τρία από αυτά."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Το πρόγραμμα εγκατάστασης θα διαμοιράσει τον κοινόχρηστο χώρο βάσει των "
+#~ "ακόλουθων κανόνων:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Στοίχιση σε\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Free space preceding (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>"
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Από αυτήν την οθόνη μπορείτε να ορίσετε μερικές προσωπικές προτιμήσεις:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Η γλώσσα (για την εγκατάσταση μόνο, μπορεί να είναι διαφορετική από τη "
+#~ "γλώσσα του συστήματος) πατώντας το πλήκτρο F2 (μόνο σε λειτουργία παλαιού "
+#~ "τύπου)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Εδώ φαίνεται για παράδειγμα, η οθόνη υποδοχής στα γαλλικά με Live CD/DVD. "
+#~ "Σημειώστε ότι το μενού του Live CD/DVD δεν προτείνει: <guilabel>Διάσωση "
+#~ "του συστήματος</guilabel>, <guilabel>Έλεγχο μνήμης</guilabel> και το "
+#~ "<guilabel>Εργαλείο εντοπισμού υλικού</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Προσθέστε μερικές επιλογές του πυρήνα πιέζοντας το πλήκτρο <emphasis role="
+#~ "\"bold\">F6</emphasis> για τη λειτουργία παλαιού τύπου ή το πλήκτρο "
+#~ "<emphasis role=\"bold\">e</emphasis> για τη λειτουργία UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Αν αποτύχει η εγκατάσταση, τότε ίσως να χρειαστεί να δοκιμάσετε ξανά "
+#~ "χρησιμοποιώντας μια από τις επιπλέον επιλογές. Το πάτημα του πλήκτρου F6 "
+#~ "εμφανίζει μια νέα γραμμή με τις <guilabel>Επιλογές του πυρήνα</guilabel> "
+#~ "και υπάρχουν διαθέσιμες τέσσερις επιλογές:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Προσθέστε περισσότερες επιλογές του πυρήνα πιέζοντας το πλήκτρο F1 (μόνο "
+#~ "σε λειτουργία παλαιού τύπου)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Χρήση ενός ενσύρματου δικτύου"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Αυτή είναι η εξ ορισμού οθόνη καλωσορίσματος όταν χρησιμοποιείτε ένα CD "
+#~ "εγκατάστασης ενσύρματου δικτύου (εικόνες netinstall.iso ή netinstall-"
+#~ "nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Δεν επιτρέπει την αλλαγή της γλώσσας, οι διαθέσιμες επιλογές "
+#~ "περιγράφονται στην οθόνη. Για περισσότερες πληροφορίες σχετικά με τη "
+#~ "χρήση ενός CD εγκατάστασης ενσύρματου δικτύου, ανατρέξτε στο <link ns2:"
+#~ "href=\"https://wiki.mageia.org/en/Boot.iso_install\">Wiki της Mageia</"
+#~ "link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Η διάταξη του πληκτρολογίου είναι η αμερικανική."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Αν επιλέξετε «με X» θα συμπεριληφθεί επίσης ο διαχειριστής παραθύρων "
+#~ "IceWM ως ένα ελαφρύ περιβάλλον εργασίας."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Εδώ μπορείτε να ρυθμίσετε το επίπεδο ασφαλείας."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Αφήστε τις προκαθορισμένες ρυθμίσεις ως έχουν, αν δεν γνωρίζετε τι να "
+#~ "επιλέξετε."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Μέσο LIVE: Μπορείτε να εκκινήσετε το μέσο πάνω σε ένα πραγματικό σύστημα "
+#~ "Mageia χωρίς να το εγκαταστήσετε ούτως ώστε να διαπιστώσετε τι θα έχετε "
+#~ "μετά την ενδεχόμενη εγκατάσταση. Η διαδικασία της εγκατάστασης είναι "
+#~ "ευκολότερη αλλά με λιγότερες επιλογές."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "CD αποκλειστικά για εκκίνηση"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Επιλέξτε το κουμπί επιλογών Αποθήκευση του αρχείου."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Μπορείτε επίσης να χρησιμοποιήσετε το εργαλείο dd σε ένα τερματικό:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Αποσυνδέστε το κλειδί USB, όλα ολοκληρώθηκαν"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Χρησιμοποιήστε αυτή την επιλογή για μια νέα εγκατάσταση "
+#~ "<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."
+#~ msgstr ""
+#~ "Αν έχετε μια ή περισσότερες εγκαταστάσεις της <application>Mageia</"
+#~ "application> στο σύστημά σας, ο οδηγός εγκατάστασης θα σας επιτρέψει να "
+#~ "αναβαθμίσετε μια από αυτές στην τελευταία έκδοση."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Οδηγίες"
+
+#~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 #~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
 #~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
@@ -5320,9 +5842,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Προσαρμοσμένο"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5333,20 +5852,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Ασφαλές ρυθμίσεις, δίνεται προτεραιότητα στις επισφαλές επιλογές σε "
-#~ "βάρος της απόδοσης."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -5583,21 +6088,6 @@ msgstr ""
 #~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
 #~ "</imageobject>"
 
-#~ msgid ""
-#~ "<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>"
-#~ 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>"
-
 #~ msgid "With a Bios system"
 #~ msgstr "Με ένα σύστημα Bios"
 
diff --git a/docs/docs/stable/installer/eo.po b/docs/docs/stable/installer/eo.po
index 4c877ad2..58fe7d72 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: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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"
@@ -28,13 +28,20 @@ msgstr "Licenco kaj publikig-notoj"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
-msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:40
@@ -61,8 +68,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Por akcepti nur selektu <guilabel>Akceptu</guilabel> kaj klaku sur "
@@ -85,9 +93,10 @@ msgstr "Publikig-notoj"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Por vidi kio estas nova en ĉi tiu versio de <application>Magejo</"
@@ -95,13 +104,13 @@ msgstr ""
 "guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "eo"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selekto de datumportilo (Konfiguru aldonaj instal-datumportiloj)"
 
@@ -109,54 +118,56 @@ msgstr "Selekto de datumportilo (Konfiguru aldonaj instal-datumportiloj)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Por interreta datumportilo sekvighos per du pashoj:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Selekti kaj aktivigi de retkonekto, se jam ne estas enshaltita"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -166,7 +177,7 @@ msgstr "Uzula kaj superuzula administrado"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -180,21 +191,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Kreo de mastrumanta pasvorto (Set administrator (root) password):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Estas konsilinde por ĉiuj instaloj de <application>Magejo</application> krei "
 "superuzulan pasvorton, kutime nomita la <emphasis>mastrumanta (root) "
@@ -205,9 +216,10 @@ msgstr ""
 "mistajpis la unuan pasvorton dank'al komparo inter ambaŭ."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "En ĉiuj pasvortoj diferenciĝas inter majuskloj kaj minuskloj, estas pli bone "
@@ -215,23 +227,25 @@ msgstr ""
 "karaktroj en pasvorto."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Enigo de uzulo (Enter a user)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "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:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -240,7 +254,7 @@ msgstr ""
 "la uzulan ikonon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -249,10 +263,11 @@ msgstr ""
 "skatolo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Saluta nomo (login name)</guilabel>: Ĉi tie eniru la uzulan "
@@ -261,42 +276,43 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>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:61
+#: en/addUser.xml:79
 #, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -305,87 +321,59 @@ msgstr ""
 "during the install. Choose <emphasis>User management</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "The access permissions can also be changed after the install."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Sperta uzulo-administrado"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano "
 "ebliganta eldoni la konfiguron de la aldonata uzulo."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Ĉio konservita de gasto uzanta defaŭltan <emphasis>rbash-an</emphasis> "
-"gastan konton en la dosierujo /home estos forigita post la elsaluto.  La "
-"gasto devus konservi gravajn dosierojn en USB-ŝlosilo."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Aktivigi gastan konton (Enable guest account)</guilabel>: Ĉi tie "
-"vi povas aktivigi aŭ malaktivigi gastan konton. Gasta konto ebligos gaston "
-"ensaluti kaj uzi la komputilon, sed ĝi havas pli da limigoj ol tiu de "
-"normalaj uzuloj."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Ŝ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:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>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:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grupa ID</guilabel>: Ĉi tio ebligas vin starigi grupan "
-"identigilon.  Ankaŭ temas pri nombro, kutime la sama kiel tiu de la uzulo. "
-"Lasu ĝin malplena se vi ne scias kion fari."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Elekti surmetingojn"
 
@@ -402,13 +390,14 @@ msgstr "Elekti surmetingojn"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -418,7 +407,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -429,41 +418,45 @@ msgstr ""
 "application> vi povas ŝanĝi la surmetingojn."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "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:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Ĉiu subdisko estas montrita tiel: \"Aparato\" (\"Kapablo\", \"Surmetingo\", "
 "\"Speco\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Aparato\", konsistas el: \"fiksita disko\", [\"fiksita diska litero\"], "
-"\"subdiska nombro\" (ekzemple, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Se vi havas multajn subdiskojn, vi povas elekti multajn malsamajn "
 "surmetingojn per la faldebla menuo, kiel <literal>/</literal>, <literal>/"
@@ -473,27 +466,29 @@ msgstr ""
 "<literal>/home</literal> subdisko de kaldrona instalo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "En kazoj de subdiskoj al kiuj vi ne volas aliri vi povas lasi la surmetingan "
 "kampon malplena."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "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:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -716,15 +711,17 @@ 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 "
+"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."
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -744,14 +741,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Elektu ĉu vi preferas uzi la labortablajn mediojn <application>KDE-on</"
 "application> aŭ <application>Gnome-on</application>. Ambaŭ venas kun "
@@ -780,8 +779,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -793,24 +793,25 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Laborstacio."
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Servilo."
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafika medio."
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Elektado de individuaj pakaĵoj: vi povas uzi ĉi tiun elekton por aldoni aŭ "
 "forigi permane pakaĵojn."
@@ -819,37 +820,40 @@ msgstr ""
 #: en/choosePackageGroups.xml:38
 #, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
 "a minimal install."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Ĉi tie vi povas elekti aŭ malelekti aldonajn pakaĵojn por agordi vian "
 "instalon."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -864,54 +868,52 @@ msgstr ""
 "instalado kaj elektante ŝarĝi ĝin."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfiguru viajn Servojn"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Ĉ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:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Estas kvar grupoj, klaku sur la triangulo kiu troviĝas antaŭ grupo por "
-"etendi ĝin kaj vidi ĉiujn servojn disponeblajn."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "La elekto kiun faris DrakX estas kutime adekvata."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr "Se vi elektas servon, iu informo pri ĝi montriĝos en la suba skatolo."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
 
@@ -924,12 +926,13 @@ msgstr "Konfiguru vian horzonon"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -939,18 +942,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "En la sekva ekrano vi povas alĝustigi vian sisteman horloĝon je la loka horo "
 "aŭ je GTM, ankaŭ konata kiel UTC."
@@ -965,117 +970,114 @@ 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:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX-im1\"></imagedata> </"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Ne gravas kiun grafikan medion (ankaŭ konata kiel labortabla medio) vi "
 "elektis por ĉi tiu instalo de <application>Magejo</application>, ili ĉiuj "
@@ -1087,7 +1089,7 @@ 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:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1096,13 +1098,14 @@ msgstr ""
 "karton en la listo se bezonate."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Ekrano</guibutton></emphasis>: Vi povas elekti "
 "<guilabel>\"Plug'n Play\"</guilabel> siakaze aŭ elekti vian monitoron en la "
@@ -1111,30 +1114,31 @@ msgstr ""
 "horizontalan kaj vertikalan refreŝ-datumon de via monitoro."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Malĝustaj refreŝ-datumoj povas damaĝi vian monitoron"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>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:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Testo</guibutton></emphasis>: La testo-butono ne ĉiam "
 "aperas dum la instalo. Se la butono estas tie, vi povas testi vian "
@@ -1145,7 +1149,7 @@ msgstr ""
 "via konfiguro estas ĝusta se la testo-butono ne estas disponebla</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1154,44 +1158,44 @@ msgstr ""
 "aŭ malaktivigi kelkajn elektojn."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1200,7 +1204,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1209,61 +1213,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1275,12 +1280,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Se vi volas utiligi ĉifradon en via subdisko <literal>/</literal> vi devas "
 "havi apartan subdiskon <literal>/boot</literal>.  La ĉifrada elekto por la "
@@ -1288,91 +1295,92 @@ msgstr ""
 "ne startos."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"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:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Premu <guibutton>Forviŝu ĉion</guibutton> por forigi ĉiujn subdiskojn en la "
 "elektita stor-aparato"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1385,31 +1393,33 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Kreo de subdiskoj"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "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:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "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:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1422,12 +1432,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Uzu ekzistantajn subdiskojn"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1436,12 +1446,12 @@ msgstr ""
 "kiuj povas esti utiligataj por la instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Uzu liberan spacon"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1450,12 +1460,12 @@ msgstr ""
 "nova Mageja instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Uzu la liberan spacon de vindoza subdisko"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1464,7 +1474,7 @@ msgstr ""
 "povas proponi utiligi ĝin."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1475,7 +1485,7 @@ msgstr ""
 "dosieroj antaŭe!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1492,46 +1502,48 @@ msgstr ""
 "personaj dosieroj."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Forviŝu kaj uzu la tutan diskon."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Ĉi tiu elekto utiligos la tutan diskon por Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu "
 "zorgema!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1541,13 +1553,13 @@ msgstr ""
 "disko kiujn vi ne volas perdi, ne elektu ĉi tion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1556,74 +1568,83 @@ msgstr ""
 "fiksita(j)  disko(j)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1635,7 +1656,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1645,15 +1666,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "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 "
@@ -1664,19 +1686,21 @@ msgstr ""
 "settings:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Align to\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Also make sure all partitions are created with an even number of megabytes."
 
@@ -1687,7 +1711,7 @@ msgid "Installation from LIVE medium"
 msgstr "Bonveniga instal-ekrano"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
@@ -1702,17 +1726,17 @@ msgid "Mageia 5"
 msgstr ""
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr ""
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1724,7 +1748,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1736,7 +1760,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1748,13 +1772,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1765,26 +1789,33 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalado per DrakX-o"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 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"
@@ -1792,7 +1823,7 @@ msgstr "Gratulon"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1803,7 +1834,7 @@ msgstr ""
 "\"exitInstall-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1813,16 +1844,17 @@ msgstr ""
 "kaj nun vi povas sekure eltiri la instal-medion kaj reŝarĝi vian komputilon."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "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:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1831,12 +1863,12 @@ msgstr ""
 "kaj ŝarĝita."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Ĝuu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1851,31 +1883,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1886,20 +1918,18 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1907,28 +1937,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Strukturi subdiskojn"
 
@@ -1937,39 +1967,40 @@ msgstr "Strukturi subdiskojn"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Ĉi tie vi povas elekti kiu(j)n subdisko(j)n vi ŝatus strukturi. Iu ajn "
 "datumo en subdisko(j) <emphasis>ne</emphasis> markita(j) por strukturado "
 "estos savita."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr "Kutime almenaŭ la subdiskoj elektitaj de DrakX bezonos strukturon"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -1978,12 +2009,13 @@ msgstr ""
 "ŝatus kontroli ĉu ekzistas <emphasis>difektitaj blokoj</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "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 "
@@ -1991,7 +2023,7 @@ msgstr ""
 "tiu ekrano vi havas elekton por vidi kio estas en viaj subdiskoj."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2000,12 +2032,12 @@ msgstr ""
 "por daŭrigi."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, la instalilo de Magejo"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2015,7 +2047,7 @@ msgstr ""
 "estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2024,25 +2056,26 @@ msgstr ""
 "mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Bonveniga instal-ekrano"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, fuzzy
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
@@ -2050,16 +2083,17 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, fuzzy
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
@@ -2067,19 +2101,30 @@ msgstr ""
 "\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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:45
+#: 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 ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2088,34 +2133,21 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:72
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#: 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><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2124,57 +2156,58 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
-msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+#. 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><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2183,20 +2216,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2205,16 +2234,16 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2223,88 +2252,62 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "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:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Ĉ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:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "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:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2321,17 +2324,17 @@ msgstr ""
 "Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instal-problemoj kaj eblaj solvoj"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Sen grafika interfaco"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2342,22 +2345,24 @@ msgstr ""
 "utiligi malaltan rezolucion per la tajpo de \"vgalo\" en la komand-linio."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instal-paneoj"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2371,14 +2376,15 @@ 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:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2389,18 +2395,19 @@ msgstr ""
 "\"mem=256M\" specifus 256MB-ojn el ĉefmemoro."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2413,18 +2420,19 @@ msgstr "Ĝisdatigoj"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"installUpdates-im1\"></imagedata> </imageobject>"
+"\"exitInstall-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2433,10 +2441,11 @@ msgstr ""
 "pluraj pakaĵoj estis probable ĝisdatigitaj aŭ plibonigitaj."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Elektu <guilabel>jes</guilabel> se vi deziras elŝuti kaj instali ilin, "
@@ -2444,8 +2453,9 @@ msgstr ""
 "havas retaliron"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Klaku sur <guibutton>Sekvanta</guibutton> por daŭrigi"
 
 #. type: Content of: <section><info><title>
@@ -2497,18 +2507,19 @@ msgstr ""
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2517,14 +2528,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2534,69 +2545,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimuma instalo"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "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:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 #, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "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:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "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:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2606,15 +2619,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2631,11 +2645,12 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX faris inteligentajn antaŭelektojn por la konfiguro de via sistemo "
 "dependante de tio kion vi elektis kaj la aparataro kiun ĝi mem eltrovis. Vi "
@@ -2645,8 +2660,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2661,72 +2676,74 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Sistemaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Horzono</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX elektis tempo-zonon por vi, dependante de via preferata lingvo. Vi "
 "povas ŝanĝi ĝin se bezonate. Vidu ankaŭ <xref linkend=\"configureTimezoneUTC"
 "\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Lando</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Se vi ne troviĝas en la selektita lando, estas tre grave ke vi korektu ĝin.  "
 "Vidu <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Startŝarĝilo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX faris bonajn elektojn por la konfiguro de la sistema ŝarĝilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 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:69
+#: 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:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Uzula administrado (User management)</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2735,21 +2752,22 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servoj</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Sistemaj servoj celas tiujn malgrandajn programojn funkciantajn fone "
 "(demonoj). Ĉi tiu ilo ebligos vin aktivigi aŭ malaktivigi diversajn taskojn."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2758,43 +2776,44 @@ msgstr ""
 "via komputilo ne funkciu ĝuste."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "For more information, see <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Aparatar-parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klavaro</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Ĉi tie vi konfiguras aŭ ŝanĝas vian klavar-agordon kiu dependas de via "
 "lando, lingvo aŭ klavar-speco."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Muso</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2803,36 +2822,36 @@ msgstr ""
 "mov-globojn, ktp."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Son-karto </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafika interfaco</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Ĉ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:141
+#: 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:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -2843,20 +2862,21 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Retaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Reto</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -2866,21 +2886,22 @@ msgstr ""
 "aktivigi la neliberajn deponejojn."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Kiam vi aldonas ret-karton ne forgesu konfiguri vian fajronŝirmilon por ke "
 "ĝi kontrolu ankaŭ tiun ret-interfacon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Prokuraj serviloj</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2890,26 +2911,27 @@ msgstr ""
 "tiu sekcio ebligas vin konfiguri vian komputilon por utiligi prokuran servon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "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:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sekureco"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Sekurec-nivelo </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2918,17 +2940,17 @@ msgstr ""
 "okazoj la defaŭlta konfiguro estas adekvata por ĝenerala uzo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Aktivigu la elekton pli adekvatan laŭ viaj bezonoj."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Fajroŝirmilo (Fajromuro)</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -2937,7 +2959,7 @@ msgstr ""
 "la reto kiuj volas kompromiti aŭ forŝteli ilin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 #, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
@@ -2948,7 +2970,7 @@ msgstr ""
 "dependos de tio por kio vi utiligas la komputilon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "Rimarku ke ebligi ĉion (sen fajroŝirmilo) povas esti tre riska."
 
@@ -3012,39 +3034,72 @@ msgstr ""
 "de spaco por la instalo de <application>Magejo</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Sekurec-nivelo"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Vi povas alĝustigi vian sekurec-nivelon ĉi tie."
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Lasu la defaŭltan konfiguron senŝanĝe se vi ne scias kion elekti."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Post la instalo, ĉiam eblos alĝustigi la sekurec-konfiguron en la fako "
 "<guilabel>Sekureco</guilabel> en la Mageja Kontrolilo."
@@ -3063,223 +3118,225 @@ msgstr ""
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+msgid "Different media for 32 and 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+msgid "All available languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr ""
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+msgid "First steps are English language only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 #, fuzzy
 msgid "netinstall.iso"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3311,9 +3368,9 @@ msgstr ""
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3324,9 +3381,9 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3336,7 +3393,7 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3345,197 +3402,209 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
+"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:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3559,39 +3628,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
+#: en/SelectAndUseISOs2.xml:317
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+msgid ""
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3625,19 +3701,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Se via lando estas nur en la listo <guilabel>Aliaj Landoj</guilabel>, post "
@@ -3645,19 +3723,19 @@ msgstr ""
 "la unua listo.  Bv. ignori tion, DrakX daŭrigos kun via reala elekto."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Enir-metodo"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 #, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "En la ekrano <guilabel>Aliaj Landoj</guilabel> vi povas ankaŭ elekti enir-"
@@ -3670,78 +3748,80 @@ msgstr ""
 "se vi aldonis HTTP/FTP-an medion antaŭ la pakaĵa selekto."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "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:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalado/ĝisdatigo"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" width=\"800\" format=\"PNG\" depth=\"600\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalado"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Uzu tiun elekton por freŝa instalado de <application>Magejo</application> ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Ĝisdatigu"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "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ŭ "
@@ -3752,12 +3832,14 @@ msgstr ""
 "Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "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 "
@@ -3790,12 +3872,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klavaro"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3804,16 +3886,17 @@ msgstr ""
 "aŭtomate elektos usonan klavaron."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3829,23 +3912,25 @@ msgstr ""
 "wikipedia.org/wiki/Klavarfasono\">eo.wikipedia.org/wiki/Klavarfasono</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Post elekti klavaron per la butono <guibutton>Pli (Plu)</guibutton> , vi "
 "revenos al la unua priklavara ekrano sed povos ŝajni kvazaŭ klavaro de tiu "
@@ -3853,22 +3938,23 @@ msgstr ""
 "instaladon: Via klavaro estas tiu kiun vi elektis per la etendita listo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Se vi elektis klavaron nebazitan sur latinaj literoj, vi vidos aldonan "
 "ekranon demandantan kiel vi ŝatus ŝanĝi inter latinaj kaj nelatinaj klavaroj"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Bv. elekti la uzotan lingvon"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3879,7 +3965,7 @@ msgstr ""
 "instalado kaj por la instalita sistemo."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -3890,12 +3976,13 @@ msgstr ""
 "instalado kaj por la instalita sistemo."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Se vi bezonas instali en via sistemo plurajn lingvojn por vi aŭ aliaj "
 "uzuloj, tiam vi devas utiligi la butonon <guibutton>Multaj lingvoj (Multiple "
@@ -3903,7 +3990,7 @@ msgstr ""
 "lingvan eltenon post la instalo."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -3917,18 +4004,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "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:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3937,23 +4025,24 @@ msgstr ""
 "rekomendinde instali la lingvon de via klavaro ankaŭ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Ĉ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:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4008,65 +4097,65 @@ msgstr ""
 "por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Lanĉilaj ĉefaj elektoj"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Lanĉilaj ĉefaj elektoj"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: 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><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4081,25 +4170,27 @@ msgstr ""
 "\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4112,50 +4203,51 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4168,18 +4260,19 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Uzi ekzistantan lanĉilon"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "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 "
@@ -4187,20 +4280,20 @@ msgstr ""
 "ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4213,14 +4306,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4230,131 +4323,126 @@ msgstr ""
 "\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>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:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Servoj</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Konfiguri SCSI"
 
@@ -4367,36 +4455,38 @@ msgstr "Konfiguri SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" width="
-"\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX kutime trovas fiksitajn diskojn senprobleme. Ĝi tamen povas ne trovi "
 "kelkajn malnovajn SCSI-aparatojn kaj do malsukcesi pri la instalado de la "
 "bezonataj peliloj."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Se tio okazas, vi devos permane diri al Drakx kiun SCSI-aparaton vi havas."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX devus tiam esti kapabla konfiguri la aparato(j)n ĝuste."
 
@@ -4420,8 +4510,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4437,33 +4526,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Progresinta"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4474,27 +4565,32 @@ msgstr ""
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
-msgstr ""
+msgstr "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4604,54 +4700,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4693,6 +4784,223 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>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."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Ĉio konservita de gasto uzanta defaŭltan <emphasis>rbash-an</emphasis> "
+#~ "gastan konton en la dosierujo /home estos forigita post la elsaluto.  La "
+#~ "gasto devus konservi gravajn dosierojn en USB-ŝlosilo."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Aktivigi gastan konton (Enable guest account)</guilabel>: Ĉi "
+#~ "tie vi povas aktivigi aŭ malaktivigi gastan konton. Gasta konto ebligos "
+#~ "gaston ensaluti kaj uzi la komputilon, sed ĝi havas pli da limigoj ol tiu "
+#~ "de normalaj uzuloj."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grupa ID</guilabel>: Ĉi tio ebligas vin starigi grupan "
+#~ "identigilon.  Ankaŭ temas pri nombro, kutime la sama kiel tiu de la "
+#~ "uzulo. Lasu ĝin malplena se vi ne scias kion fari."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Aparato\", konsistas el: \"fiksita disko\", [\"fiksita diska litero\"], "
+#~ "\"subdiska nombro\" (ekzemple, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Laborstacio."
+
+#~ msgid "Server."
+#~ msgstr "Servilo."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafika medio."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Estas kvar grupoj, klaku sur la triangulo kiu troviĝas antaŭ grupo por "
+#~ "etendi ĝin kaj vidi ĉiujn servojn disponeblajn."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "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-"
+#~ "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 "\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Vi povas alĝustigi vian sekurec-nivelon ĉi tie."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "Lasu la defaŭltan konfiguron senŝanĝe se vi ne scias kion elekti."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" width=\"800\" format=\"PNG\" depth=\"600\"></imagedata> </"
+#~ "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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"setupSCSI-im1\"></imagedata> </imageobject>"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4900,21 +5208,6 @@ msgstr ""
 #~ "</imageobject>"
 
 #~ msgid ""
-#~ "<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>"
-#~ 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>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 #~ "imageobject>"
 #~ msgstr ""
@@ -5045,14 +5338,6 @@ msgstr ""
 #~ "\" width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
 #~ "\"setRootPassword-im1\"></imagedata> </imageobject>"
 
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-#~ "imagedata> </imageobject>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-selectLanguage.png\" align=\"center"
 #~ "\" format=\"PNG\" > </imagedata> </imageobject>"
diff --git a/docs/docs/stable/installer/es.po b/docs/docs/stable/installer/es.po
index 02bef010..e6bb3043 100644
--- a/docs/docs/stable/installer/es.po
+++ b/docs/docs/stable/installer/es.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-01-07 09:03+0000\n"
 "Last-Translator: Miguel Ortega\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -42,12 +42,13 @@ msgstr "Licencia y Notas de la Versión"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -81,8 +82,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Para aceptar, simplemente seleccione <guilabel>Aceptar</guilabel> y luego "
@@ -105,9 +107,10 @@ msgstr "Notas de la versión"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Se da información importante acerca de esta versión de <application>Mageia</"
@@ -115,13 +118,13 @@ msgstr ""
 "<guibutton>Notas de la Versión</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "es"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selección de Medios (Configurar Medios de Instalación Complementarios)"
 
@@ -129,23 +132,25 @@ msgstr "Selección de Medios (Configurar Medios de Instalación Complementarios)
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Esta pantalla muestra la lista de repositorios ya reconocidos. Puede agregar "
 "otras fuentes de paquetes como un disco óptico o una fuente remota. La "
@@ -153,23 +158,25 @@ msgstr ""
 "siguientes pasos."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Para un repositorio por red, hay dos pasos a seguir:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "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:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Seleccionar un servidor espejo o especificar una URL (la primera entrada). "
 "Al seleccionar un servidor espejo tendrá acceso a la selección de todos los "
@@ -178,14 +185,15 @@ msgstr ""
 "propia instalación NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Si está actualizando a una instalación de 64 bits que puede contener algunos "
 "paquetes de 32 Bits, se aconseja utilizar esta pantalla para agregar un "
@@ -201,7 +209,7 @@ msgstr "Administración de usuarios y del administrador"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -214,21 +222,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Establezca la Contraseña del Administrador (root)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Es recomendable que configure una contraseña de administrador/súper usuario, "
 "conocida como <emphasis>contraseña de root</emphasis> en Linux, para todas "
@@ -240,9 +248,10 @@ msgstr ""
 "ningún error en la primera contraseña,comparándolas."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Todas las contraseñas son sensibles a las mayúsculas. Para tener una "
@@ -250,16 +259,18 @@ msgstr ""
 "minúsculas), números y otros símbolos."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduzca un usuario"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Aquí puede añadir un usuario. Un usuario tiene menos permisos que el "
 "administrador, pero suficientes para navegar en Internet, usar aplicaciones "
@@ -267,7 +278,7 @@ msgstr ""
 "ordenador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -276,7 +287,7 @@ msgstr ""
 "del usuario."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -285,10 +296,11 @@ msgstr ""
 "usuario en este recuadro."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Nombre de conexión</guilabel>: Aquí puede introducir el nombre de "
@@ -297,40 +309,42 @@ msgstr ""
 "las mayúsculas.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Contraseña</guilabel>: En esta caja de texto debería escribir la "
 "contraseña del usuario. Luego de la caja de texto, hay un escudo que indica "
 "la fortaleza de la contraseña. (Vea también <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Contraseña (de nuevo)</guilabel>: Vuelva a escribir la contraseña "
-"en este recuadro y Drakx comprobará que ha escrito la misma que en el "
-"recuadro anterior."
+"<guilabel>Contraseña (de nuevo)</guilabel>: vuelva a escribir la contraseña "
+"y Drakx comprobará que coincide con la que se ha definido anteriormente."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Cualquier usuario que agregue mientras instala Mageia, tendrá un directorio "
 "de inicio protegido tanto de lectura como de escritura (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -339,86 +353,58 @@ msgstr ""
 "<emphasis>Gestión de usuarios</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Los permisos de acceso se pueden cambiar también tras la instalación."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Administración Avanzada de Usuarios"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Si hace click en el botón \"avanzado\", aparecerá una pantalla que le "
 "permite editar la configuración del usuario que está añadiendo. "
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Adicionalmente, puede activar o desactivar una cuenta de invitado."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Cualquier cosa que un usuario invitado (con <emphasis>rbash</emphasis>) "
-"guarde en su directorio home será borrado cuando cierre sesión. El invitado "
-"debe de guardar sus archivos importantes en una unidad USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Habilitar cuenta de invitado</guilabel>: Aquí puede habilitar o "
-"inhabilitar la cuenta de invitado. La cuenta de invitado permite a un "
-"usuario ocasional acceder y usar el PC, pero tiene un acceso más restringido "
-"que los usuarios normales."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: Esta pestaña permite cambiar el shell usado por "
 "el usuario que está añadiendo. Las opciones son Bash, Dash y Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID de usuario</guilabel>: Aquí puede configurar el número de "
 "identificación del usuario que está añadiendo. Es un número. Déjelo vació "
 "salvo que sepa lo que está haciendo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID de grupo</guilabel>: Aquí puede configurar el número de "
-"identificación del grupo. También es un número, normalmente el mismo que "
-"para el usuario. Déjelo vacío salvo que sepa lo que está haciendo."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Elija los puntos de montaje"
 
@@ -435,13 +421,14 @@ msgstr "Elija los puntos de montaje"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -451,7 +438,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -462,41 +449,45 @@ msgstr ""
 "application>, puede cambiar los puntos de montaje."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Si cambia algo, asegúrese de que conserva una partición <literal>/</literal> "
 "(root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Cada partición se muestra así: \"Dispositivo\" (\"Capacidad\", \"Punto de "
 "montaje\", \"Tipo\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Dispositivo\", está compuesto por: \"disco duro\", [\"número del disco duro"
-"\"(letra)], \"número de partición\" (por ejemplo, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Si tiene varias particiones, puede elegir diferentes puntos de montaje "
 "desplegando la lista, como <literal>/</literal>, <literal>/home</literal> y "
@@ -506,20 +497,22 @@ msgstr ""
 "partición <literal>/home</literal> de una instalación Cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Para las particiones a las que no necesite acceso, puede dejar el punto de "
 "montaje vacío."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Elija <guibutton>Anterior</guibutton> si no está seguro de qué elegir y "
 "luego marque <guilabel>Particionamiento personalizado</guilabel>. En la "
@@ -527,7 +520,7 @@ msgstr ""
 "tamaño."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -794,8 +787,9 @@ msgstr "Selección de escritorio"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Dependiendo de su selección aquí, pueden aparecer otras ventanas para "
@@ -803,8 +797,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -823,14 +818,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Elija el entorno de escritorio que prefiera, <application>KDE</application> "
 "o <application>Gnome</application>. Ambos incluyen un juego completo de "
@@ -857,8 +854,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -870,62 +868,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Estación de trabajo."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Tamaño de partición:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Servidor."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Entorno gráfico."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Selección individual de paquetes: Puede usar esta opción para añadir o "
 "eliminar manualmente los paquetes."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lea <xref linkend = \"minimal-install\" /> para obtener instrucciones sobre "
 "cómo realizar una instalación mínima (sin o con X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Elegir paquetes detalladamente"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackagesTree."
-"png\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Aquí puede añadir o eliminar cualquier paquete extra para personalizar su "
 "instalación."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -940,47 +945,45 @@ msgstr ""
 "durante la instalación para cargarlo."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configure sus Servicios"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Aquí puede configurar que servicios deberían (o no) iniciarse cuando "
 "arranque su sistema."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Hay cuatro grupos, haga click en el triángulo junto al grupo para expandirlo "
-"y ver todos los servicios que contiene."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "La configuración elegida por DrakX es normalmente la más correcta."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -989,7 +992,7 @@ msgstr ""
 "abajo."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Sólo cambie servicios cuando sepa bien lo que está haciendo."
 
@@ -1002,12 +1005,13 @@ msgstr "Configure su huso horario"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1017,18 +1021,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Elija su zona escogiendo su país o una ciudad próxima a usted en el mismo "
 "huso horario."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "En la siguiente pantalla, puede ajustar el reloj de su hardware a una hora "
 "local o GMT, también conociddo como UTC."
@@ -1043,23 +1049,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:11
+#: en/configureX_card_list.xml:13
 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:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1068,7 +1074,7 @@ msgstr ""
 "usualmente puede identificar su tarjeta correctamente."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1077,37 +1083,30 @@ msgstr ""
 "sabe cuál es, puede escogerla del árbol:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "fabricante"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "el nombre de su tarjeta"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "y el tipo de tarjeta"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Si no puede encontrar su tarjeta en la lista de fabricantes (porque todavía "
-"no se ha incluido en la base de datos o la tarjeta es vieja) puede encontrar "
-"un controlador apropiado en la categoría de Xorg."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "El listado de Xorg provee más de 40 controladores genéricos y de código "
 "abierto para su tarjeta de vídeo. Si todavía no puede encontrar un "
@@ -1115,63 +1114,67 @@ msgstr ""
 "vesa. Este controlador provee una capacidad básica a su tarjeta de vídeo."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Sea consciente que si escoge el controlador equivocado, podria tener acceso "
 "solamente al interfaz de la línea de comandos."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Algunos fabricantes de tarjetas de vídeo proveen controladores propietarios "
 "para Linux que se encuentran solamente en los repositorios Nonfree. En "
 "algunos casos, solo se encuentran en el sitio web del fabricante."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Los repositorios Nonfree tienen que ser activados explícitamente para poder "
 "acceder a ellos. Esto se debe hacer después de reiniciar su sistema."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"  <imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Independientemente del entorno gráfico (también conocido como entorno de "
 "escritorio) que usted elija para esta instalación de <application>Mageia</"
@@ -1184,7 +1187,7 @@ msgstr ""
 "no eligió nada o no eligió correctamente."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1193,13 +1196,14 @@ msgstr ""
 "tarjeta de la lista si es necesario."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Puede elegir "
 "<guilabel>Plug'n Play</guilabel> cuando sea posible, o escoger su monitor de "
@@ -1208,30 +1212,31 @@ msgstr ""
 "tasas de refresco horizontal y vertical de su monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Tasas de refresco incorrectas pueden dañar su monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Resolución</guibutton></emphasis>: Fije la resolución "
 "deseada y la profundidad de color de su monitor aquí."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Prueba</guibutton></emphasis>: El botón de prueba no "
 "siempre aparece durante la instalación. Si el botón está, puede controlar su "
@@ -1243,7 +1248,7 @@ msgstr ""
 "disponible</emphasis>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1252,12 +1257,12 @@ msgstr ""
 "activar o desactivar varias opciones."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Escogiendo su monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1266,12 +1271,13 @@ msgstr ""
 "identificar su monitor correctamente."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Escogiendo un monitor con características diferentes puede dañar "
 "su pantalla o componentes de vídeo. Por favor, no intente hacer algo sin "
@@ -1279,23 +1285,23 @@ msgstr ""
 "documentacion de su monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalizado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1308,7 +1314,7 @@ msgstr ""
 "horizontal es la tasa por lo cual las lineas de escaneo se pueden ver."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1321,12 +1327,12 @@ msgstr ""
 "consulte la documentacion de su monitor."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1335,12 +1341,12 @@ msgstr ""
 "que tiene usando la base de datos de monitores."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Vendedor</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1349,28 +1355,30 @@ msgstr ""
 "cuál es, lo puede escoger del árbol:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "el nombre del fabricante del monitor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "la descripción del monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Genérico</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "escogiendo este grupo, se muestra casi 30 configuraciones de pantalla como "
 "1024x768 @ 60Hz y encluye pantallas planas como las que se usan en "
@@ -1380,12 +1388,12 @@ msgstr ""
 "selección conservadora. "
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particionado de disco personalizado con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1396,12 +1404,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Si desea encriptar su partición <literal>/</literal>, debe asegurarse de que "
 "tiene una partición <literal>/boot</literal> separada. La opción de "
@@ -1409,42 +1419,44 @@ msgstr ""
 "lo contrario, su sistema no arrancará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Administre los discos aquí. Puede crear o eliminar particiones, cambiar el "
 "sistema de ficheros de una partición, o su tamaño, o incluso ver lo que hay "
 "en ella antes de comenzar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Hay una pestaña para cada disco duro o sistema de almacenaje detectados, "
-"como una unidad USB. Por ejemplo, sda, sdb y sdc si se encuentran tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Pulse <guibutton>Quitar todo</guibutton> para eliminar todas las particiones "
 "del disco de almacenaje seleccionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Para todas las demás acciones: click en la partición adecuada primero. "
 "Entonces, véala o elija un sistema de ficheros y un punto de montaje, o "
@@ -1453,32 +1465,34 @@ msgstr ""
 "etiqueta o escoger un tipo de partición."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continue hasta que ajuste todo a su gusto."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Si está instalando Mageia en un ordenador con UEFI, compruebe que existe una "
 "partición ESP (EFI System Partition) correctamente montada en /boot/EFI (ver "
 "más abajo)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1486,12 +1500,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1500,7 +1514,7 @@ msgstr ""
 "partición de arranque del BIOS y del tipo correcto."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1513,32 +1527,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Particionando"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "En esta pantalla puede ver el contenido de su(s) disco(s) duro(s) y ver el "
 "sitio que el asistente de particionado de DrakX ha encontrado para instalar "
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Las opciones disponibles en la lista de abajo pueden variar dependiendo del "
 "contenido de su(s) disco(s)  duro(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1551,12 +1567,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Usar la partición existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1565,12 +1581,12 @@ msgstr ""
 "compatibles con Linux que pueden ser usadas para la instalación."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Usar el espacio libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1579,12 +1595,12 @@ msgstr ""
 "nueva instalación de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Usar espacio libre en una partición de Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1593,7 +1609,7 @@ msgstr ""
 "puede ofrecer usarlo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1604,7 +1620,7 @@ msgstr ""
 "de seguridad de todos sus archivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1622,12 +1638,14 @@ msgstr ""
 "de sus archivos personales."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Con esta opción, el instalador muestra la partición Windows restante en azul "
 "claro y la futura partición Mageia en azul oscuro con sus tamaños "
@@ -1636,37 +1654,39 @@ msgstr ""
 "imagen siguiente."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Borrar y usar el disco entero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Esta opción usará el disco completo para Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "¡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:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1676,12 +1696,12 @@ msgstr ""
 "en la unidad que no quiere perder, no use esta opción."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Particionamiento de disco personalizado"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1690,68 +1710,81 @@ msgstr ""
 "en su(s)  disco(s) duro(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: 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><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"El instalador compartirá el espacio disponible de acuerdo con las siguientes "
-"reglas:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Si el espacio total disponibles es menor que 50 GB, se crea una sola "
 "partición para /, y no hay una partición separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Si el espacio total disponible supera los 50 GB, entonces se crean tres "
 "particiones"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "6/19 del espacio total disponible se asigna a / con un máximo de 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 se asigna a swap con un máximo de 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "el resto (por lo menos 12/19) se asigna a /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Esto significa que a partir de 160 GB de espacio disponible, el instalador "
 "creará tres particiones: 50 GB para /, 4 GB para swap y el resto para /home"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Si está utilizando un sistema UEFI, la ESP (EFI System Partition) se "
 "detectará automáticamente o se creará si aún no existe y se montará en / "
@@ -1759,13 +1792,14 @@ msgstr ""
 "permite comprobar que se ha realizado correctamente."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Si está utilizando un sistema heredado (conocido como CSM o BIOS) con un "
 "disco GPT, debe crear una partición de arranque Bios si aún no existe. Se "
@@ -1776,7 +1810,7 @@ msgstr ""
 "MiB sin punto de montaje."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1787,7 +1821,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1796,15 +1830,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Algunos discros duros recientes usan sectores lógicos de 4096 bytes, en vez "
 "de la versión estándar de 512 bytes. Debido a la falta de hardware "
@@ -1815,19 +1850,22 @@ msgstr ""
 "siguientes configuraciones:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Alinear a\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Espacio libre que precede a (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Asegúrese de que todas las particiones se han creado con un número par de "
 "megabytes."
@@ -1838,7 +1876,7 @@ 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:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1853,18 +1891,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Documentación Oficial para Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1876,7 +1914,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1888,7 +1926,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1900,13 +1938,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1917,26 +1955,34 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalación con DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Febrero 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1944,7 +1990,7 @@ msgstr "Felicitaciones"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1953,7 +1999,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1963,16 +2009,17 @@ msgstr ""
 "ahora es seguro retirar el medio de instalación y reiniciar su ordenador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Después del reinicio, en el cargador de arranque, puede elegir entre los "
 "sistemas operativos de su ordenador (si tiene más de uno)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1981,12 +2028,12 @@ msgstr ""
 "Mageia será automáticamente seleccionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "¡Que lo disfrute!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2000,11 +2047,12 @@ msgstr "Cortafuegos"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Esta sección permite configurar algunas reglas de firewall simples: "
 "determinan qué tipo de mensaje de Internet será aceptado por el sistema de "
@@ -2013,15 +2061,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "En el ajuste predeterminado, no se comprueba ningún botón - ningún servicio "
 "del sistema es accesible desde la red. La opción \"<emphasis>Toco (sin "
@@ -2034,10 +2083,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Todos los demás botones son más o menos auto-explicativos. Por ejemplo, "
 "puede comprobar el botón \"servidor CUPS\" si quiere que las impresoras de "
@@ -2050,12 +2100,11 @@ msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "El conjunto de botones sólo hace referencia a los servicios más comunes. El "
 "botón \"Avanzado\" permite activar mensajes que corresponden a un servicio "
@@ -2064,12 +2113,12 @@ msgstr ""
 "escribieno una lista de parejas (separadas por espacios en blanco)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2080,7 +2129,7 @@ msgstr ""
 "definido como <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2089,7 +2138,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - el protocolo de internet que usa el servicio."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2098,7 +2147,7 @@ msgstr ""
 "tanto <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2107,7 +2156,7 @@ msgstr ""
 "añadir dos parejas para el mismo puerto."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formateo"
 
@@ -2116,14 +2165,14 @@ msgstr "Formateo"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2133,24 +2182,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Aquí puede elegir qué partición(es) quiere formatear. Se guardará cualquier "
 "información en las particiones <emphasis>no</emphasis> marcadas para "
 "formatear."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Normalmente, por lo menos las particiones seleccionadas por DrakX, necesitan "
 "formatearse."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2159,12 +2209,13 @@ msgstr ""
 "quiera comprobar los <emphasis>bloques defectuosos</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Si no está seguro de haber hecho la elección correcta, puede hacer click en "
 "<guibutton>Anterior</guibutton>, de nuevo en <guibutton>Anterior</guibutton> "
@@ -2172,7 +2223,7 @@ msgstr ""
 "principal.  En esta pantalla puede comprobar lo que haya en sus particiones."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2181,12 +2232,12 @@ msgstr ""
 "guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, el instalador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2197,7 +2248,7 @@ msgstr ""
 "posible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2206,36 +2257,40 @@ msgstr ""
 "iniciará el instalador, que normalmente será todo lo que necesite."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de bienvenida del Instalador"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Usando un DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Aquí está la pantalla de bienvenida por defecto cuando se usa un DVD Mageia. "
 "La primera con un sistema UEFI y la segunda para sistemas antiguos."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Desde esta pantalla, se puede acceder a las opciones presionando la tecla \"e"
 "\" para entrar en el \"modo de edición\". Para volver a la pantalla, pulse o "
@@ -2243,117 +2298,111 @@ msgstr ""
 "salir."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Desde esta pantalla, se pueden concretar algunas preferencias."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"El idioma (para la instalación solamente, puede ser diferente al lenguaje "
-"elegido para el sistema) pulsando la tecla F2 (modo heredado solamente)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+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 ""
-"Use las teclas de flechas para elegir el idioma y pulse la tecla Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Aquí hay un ejemplo, la pantalla de bienvenida en Francés al emplear un CD/"
-"DVD de tipo Live. Note que el menú de dicho DVD/CD no propone: "
-"<guilabel>Sistema de recuperacion</guilabel>, <guilabel>Prueba de Memoria</"
-"guilabel> ni <guilabel>Herramienta de deteccion de Hardware</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr ""
+"Use las teclas de flechas para elegir el idioma y pulse la tecla Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Cambie la resolución de pantalla pulsando la tecla F3 (modo heredado "
 "solamente)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Añadir algunas opciones del núcle presionando \"F6\"  para el modo heredado, "
-"o \"e\" para el modo UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Por defecto, no cambia nada en las opciones por defecto."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Si la instalación falla, entonces puede ser necesario intentarlo de nuevo "
-"usando alguna de las opciones extra. El menú que aparece al pulsar F6 "
-"muestra la nueva línea <guilabel>Opciones de arranque</guilabel> y propone "
-"cuatro opciones:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Por defecto, no cambia nada en las opciones por defecto."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Sin ACPI (Advanced Configuration and Power Interface), la administración "
 "de energía no se tiene en cuenta."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Sin Local APIC (Local Advanced Programmable Interrupt Controller), se "
 "refiere a las interrupciones de la CPU. Seleccione esta opción si se le pide."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2362,53 +2411,52 @@ msgstr ""
 "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:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "En algunas versiones de Maegia, puede suceder que las opciones seleccionadas "
 "con la tecla F6 no aparezcan en la línea <guilabel>Opciones de Arranque</"
 "guilabel>. Sin embargo, sí se tienen en cuenta."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr "Añadir más opciones de kernel pulsando la tecla F1 (sólo modo Legacy)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "La techa F1 abre una nueva ventana con más opciones disponibles. Seleccione "
 "una con las techas de cursor y pulse Enter para ver más detalles, o pulse la "
 "tecla Esc para regresar a la pantalla de bienvenida."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "La vista detallada de la pantalla de opciones. Presione Esc o seleccione "
 "<guilabel>Retornar a las opciones de Arranque</guilabel> para regresar a la "
@@ -2416,20 +2464,23 @@ msgstr ""
 "<guilabel>Opciones de Arranque</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "Esta ayuda se encuentra traducida en el idioma de su elección con la tecla F2"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2440,81 +2491,47 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Usando una red por cable"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Aquí está la pantalla de bienvenida por defecto cuando se una una intalación "
-"por CD a través de una red por cable (imágenes netinstall.iso o netinstall-"
-"nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"No se permite cambiar el idioma, las opciones están descritas en la "
-"pantalla. Para mayor información relacionada a como usar el CD de "
-"instalación basada en Red Alámbrica, visite <link ns2:href=\"https://wiki."
-"mageia.org/en/Boot.iso_install\">el Wiki de Mageia</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "La distribución del teclado es la de un teclado Americano"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Los pasos de la instalación"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "El proceso de instalación está dividido en un número de pasos que pueden ser "
 "seguidos en el panel lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Cada paso tiene una o varias pantallas que pueden tener botones "
 "<guibutton>Avanzados</guibutton> con opciones extra, normalmente poco usadas."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "La mayoría de las pantallas tiene botones de <guibutton>Ayuda</guibutton> "
 "que le darán explicaciones sobre el paso en cuestión."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2531,17 +2548,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultáneamente para reiniciar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 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:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "No hay Interfaz Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2553,13 +2570,16 @@ msgstr ""
 "code> en la terminal."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Si el Hardware es un viejo, Tal vez no se posible realizar una instalación "
 "gráfica. En dicho caso, podría intentar una instalación en modo texto. Para "
@@ -2569,12 +2589,12 @@ msgstr ""
 "instalación en modo texto."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "La Instalación se congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2589,14 +2609,15 @@ msgstr ""
 "con otras si es necesario."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problema de RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2608,18 +2629,20 @@ msgstr ""
 "256MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Particiones dinámicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Si usted convirtió su disco duro de formato \"básico\" a \"dinámico\" en "
 "Microsoft Windows, debe saber que será imposible instalar Mageia en este "
@@ -2637,18 +2660,18 @@ msgstr "Actualizaciones"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"../es/dx2-installUpdates."
-"png\" align=\"center\" xml:id=\"installUpdates-im1\" format=\"PNG\" /> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2657,18 +2680,20 @@ msgstr ""
 "han actualizado o mejorado algunos paquetes."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Elija <guilabel>Sí</guilabel> si quiere instalarlas, elija <guilabel>No</"
 "guilabel> si no quiere hacerlo ahora, o si no está conectado a Internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Luego, pulse <guibutton>Siguiente</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
@@ -2726,18 +2751,18 @@ msgstr "Selección de medio (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2750,7 +2775,7 @@ msgstr ""
 "elegidos en los próximos pasos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2759,7 +2784,7 @@ msgstr ""
 "contiene la base de la distribución."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2774,13 +2799,14 @@ msgstr ""
 "firmware para diversas tarjetas WiFi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "El repositorio <emphasis>Tainted</emphasis> incluye paquetes liberados bajo "
 "una licencia libre. El criterio principal para poner paquetes en este "
@@ -2790,38 +2816,41 @@ msgstr ""
 "reproducir DVD de video comercial, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalación mínima."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Puede elegir la instalación mínima deseleccionando todo en la pantalla de "
 "Selección de Grupos de Paquetes, vea <xref linkend=\"choosePackageGroups\"></"
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Si lo desea, puede adicionalmente marcar la opción \"selección individual de "
 "paquetes\" en la misma pantalla."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "La instalación mínima está pensada para usos muy concretos de "
 "<application>Mageia</application>, como pueden ser un servidor o una "
@@ -2830,25 +2859,24 @@ msgstr ""
 "instalación, ver <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Si selecciona este tipo de instalación, la siguiente pantalla le ofrecerá "
 "algunos extras útiles para instalar, como documentación y las X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Si se selecciona, \"Con X\" también incluirá el entorno de escritorio ligero "
-"IceWM."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2863,15 +2891,15 @@ msgstr ""
 "coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2888,11 +2916,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX elige inteligentemente la configuración para su sistema dependiendo "
 "del hardware que ha detectado.  Puede comprobar la configuración aquí y "
@@ -2900,9 +2929,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Como regla general, se recomienda la configuración por defecto, que se puede "
 "manterner salvo 3 excepciones:"
@@ -2919,71 +2949,75 @@ 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 "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "se da más información en las secciones siguientes"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Configuraciones del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Huso horario</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX le elige un huso horario dependiendo del idioma seleccionado. Puede "
 "cambiarlo si lo necesita, Vea también <xref linkend=\"configureTimezoneUTC\"/"
 ">"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Región</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Si no está en el país seleccionado, es importante que lo corrijas. Vea <xref "
 "linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Cargador de arranque</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX ha hecho una buena elección para el cargador del arranque."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "No cambie nada, a menos que sepa como configurar Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Para más información, vea <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Administración de usuarios</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2992,22 +3026,23 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servicios</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Los Servicios del sistema se refieren a esos pequeños programas que "
 "funcionan en segundo plano (conocidos como \"demonios\"). Esta herramienta "
 "le permite activar o desactivar algunos de ellos."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3016,32 +3051,33 @@ msgstr ""
 "equivocación puede hacer que su ordenador no funcione correctamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Para obtener más información, consulte <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Configuraciones de hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclado</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Aquí es donde puede configurar o cambiar la disposición de su teclado, que "
 "dependerá de su localización, lenguaje o tipo de teclado."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3050,12 +3086,12 @@ msgstr ""
 "cuenta que las contraseñas cambiarán también."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ratón</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3064,39 +3100,40 @@ msgstr ""
 "trackballs, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Tarjeta de sonido</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "El instalador usa el driver por defecto, si hay alguno. La opción de escoger "
 "uno diferente aparece solamente cuando hay más de un driver para su tarjeta "
 "pero ninguno es el que viene por defecto."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaz gráfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "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:141
+#: 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:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3105,20 +3142,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Configuraciones de redes e Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Red</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3128,21 +3166,22 @@ msgstr ""
 "activados los repositorios non-free."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Cuando añada una tarjeta de red, no olvide configurar el cortafuegos para "
 "que también la controle."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Servidores proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3153,26 +3192,27 @@ msgstr ""
 "proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Puede que necesite consultar a su administrador de sistemas para obtener los "
 "parámetros que debe poner aquí."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Seguridad"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivel de seguridad</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3182,17 +3222,17 @@ msgstr ""
 "para un uso general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "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:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Cortafuegos</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3202,7 +3242,7 @@ msgstr ""
 "pueden intentar robar o comprometer sus archivos."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3213,7 +3253,7 @@ msgstr ""
 "información, consulte <xref linkend=\"firewall\" />."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "¡Tenga en cuenta de que permitiendo todo (sin cortafuegos) puede ser muy "
@@ -3283,39 +3323,73 @@ msgstr ""
 "espacio para instalar <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Tamaño de partición:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Aquí puede ajustar su nivel de seguridad."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Avanzado</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Si no sabe qué elegir, deje la configuración por defecto como está."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Después de instalar, siempre será posible cambiar sus ajustes de seguridad "
 "en la parte de <guilabel>Seguridad</guilabel> del Centro de Control de "
@@ -3333,25 +3407,27 @@ msgstr "Introducción"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia se distribuye mediante imágenes ISO. Esta página lo ayudará a elegir "
 "que imagen se ajusta a sus necesidades."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Hay dos familias de medios:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Instalador clásico: Tras el arranque, seguirá un proceso que permite elegir "
 "qué instalar y cómo configurar su sistema. Esto le da la máxima flexibilidad "
@@ -3359,83 +3435,87 @@ msgstr ""
 "escritorio quiere instalar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Sistema LIVE: puede iniciar su ordenador en un sistema real Mageia sin "
-"instalarlo, para ver lo que obtendría tras una instalación. El proceso de "
-"instalación es más sencillo, pero tiene menos opciones."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "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:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Medio"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definicion"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Aquí llamamos medio a un archivo de imagen ISO que permite instalar y/o "
 "actualizar Mageia y por extensión a cualquier soporte físico dónde el "
 "archivo ISO sea copiado."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Los puede encontar<link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">aquí</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Medio de instalación clásico."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Caracterśticas comunes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Estas ISOs utilizan el instalador tradicional llamado drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Son capaces de hacer una instalación limpia o una actualización de "
 "lanzamientos previos."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Medios diferentes para arquitecturas de 32 o 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3444,13 +3524,13 @@ msgstr ""
 "de Rescate, Prueba de Memoria, Herramienta de Detección de Hardware."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 "Cada DVD contiene todos los entornos de escritorio y lenguajes disponibles."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3458,102 +3538,107 @@ msgstr ""
 "libre."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Medio Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Puede ser utilizado para probar la distribución sin haberla instalado "
 "previamente en un disco rígido y , opcionalmente, instalar Mageia en su "
 "disco rígido."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "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:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">las imágenes ISO Vivas sólo pueden ser utilizadas "
 "para crear instalaciones limpias, no pueden utilizarse para actualizar desde "
 "versiones previas.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Ellos contienen software no libre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "DVD Live Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Solo entorno de escritorio Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Todos los idiomas presentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Arquitectura de 64 bits solamente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 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:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "DVD Live Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Solo entorno de escritorio Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "Arquitecturas de 32 o 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Medio CD sólo de arranque"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3565,28 +3650,30 @@ msgstr ""
 "Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Estos medios son muy livianos (menos de 100 MB) y son convenientes cuando el "
 "ancho de banda es demasiado bajo para descargar un DVD completo, o para PC "
 "sin una unidad de DVD o PC que no pueden arrancar desde USB."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Sólo idioma Inglés."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3620,11 +3707,12 @@ msgstr "Descargando"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Una vez que haya elegido su archivo ISO, puede descargarlo utilizando http o "
 "BitTorrent. En ambos casos, una ventana le da alguna información, como el "
@@ -3638,10 +3726,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "Md5sum y sha1sum son herramientas para comprobar la integridad ISO. Utilice "
 "sólo una de ellas. Mantenga una de ellas <link linkend=\"integrity\">para "
@@ -3654,8 +3743,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Marque el botón Guardar Archivo."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3663,14 +3752,15 @@ 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:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Ambas sumas de comprobación son números hexadecimales calculados mediante un "
 "algoritmo del archivo que se va a descargar. Cuando solicita que estos "
@@ -3680,69 +3770,84 @@ msgstr ""
 "intentar una reparación utilizando BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Abra una consola, no es necesario ser root, y:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Para usar md5sum tipee:[sam@localhost]$<userinput>md5sum ruta/a/la/imagen/"
 "archivo.iso</userinput>"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "-Para usar sha1sum tipee:[sam@localhost]$<userinput>sha1sum ruta/a/la/imágen/"
 "archivo.iso</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"y compare el número obtenido en su computadora (puede tener que esperar un "
-"poco) con el número provisto por Mageia. Ejemplo:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"y compare el número obtenido en su computadora (puede tener que esperar un "
+"poco) con el número provisto por Mageia. Ejemplo:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Grabar o volcar el ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "La ISO ahora se puede grabar en un CD o DVD o descargarse en una memoria "
 "USB. Estas operaciones no son una simple copia y tienen como objetivo crear "
 "un medio arrancable."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 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:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Use cualquier quemador que desee, pero asegúrese de que el dispositivo "
 "grabador está establecido correctamente para <emphasis role=\"bold\"> quemar "
@@ -3751,12 +3856,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">la wiki de Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Volvar el ISO en un USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3765,18 +3870,19 @@ msgstr ""
 "en un USB y usarlas para arrancar e instalar el sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\\\"Montar\\\" una imagen en un dispositivo flash, destruye cualquier "
 "sistema de archivos antes de la partición; todos los datos se perderán 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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3785,12 +3891,12 @@ msgstr ""
 "dispositivo USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 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:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3799,71 +3905,70 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Usando una herramienta gráfica dentro de Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Usted puede probar:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> usando "
 "la opción \"imagen ISO\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disco de Imagenes</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Usando la Línea de comandos dentro de un sistema GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Es potencialmente *peligroso* hacer esto a mano. Se arriesga a sobrescribir "
 "una partición del disco si obtiene un identificador de dispositivo erróneo."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "También puede utilizar el comando \"dd\" en una consola:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Abrir consola"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr "Conviértase en root con el comando su - (no se olvide del - al final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3872,28 +3977,40 @@ msgstr ""
 "archivos que pueda leerlo)."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Introduzca el comando \"fdisk-l\"."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Busca el nombre del dispositivo USB (por su tamaño). Por ejemplo, <code>/dev/"
+"sdb/</code> in la imagen siguiente es un dispositivo USB de 8GB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "También se puede obtener el nombre del dispositivo mediante el comando "
 "<code>dmesg</code>: al final, puede ver el nombre del dispositivo con "
 "<emphasis>sd</emphasis> y <emphasis>sdd</emphasis> in este caso:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3935,44 +4052,53 @@ 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:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Busca el nombre del dispositivo USB (por su tamaño). Por ejemplo, <code>/dev/"
-"sdb/</code> in la imagen siguiente es un dispositivo USB de 8GB."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr "Introduzca el comando: # dd if=/ruta al archivo ISO of=/dev/sdX bs=1M"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Donde X=nombre de tu dispositivo ej:/dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Ejemplo: # <userinput> dd if=/home/user/Descargas/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Introduce el comando: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Desconecta tu pendrive USB, esta echo"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4002,19 +4128,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Si su país no se encuentra en la lista, haga click en <guilabel>Otros "
 "Países</guilabel> y elija su país / región allí."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Si su país está únicamente en la lista de <guilabel>Otros Países</guilabel>, "
@@ -4023,18 +4151,19 @@ msgstr ""
 "seguirá su elección real."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Método de entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "En la pantalla <guilabel>Otros países</guilabel> también puede seleccionar "
@@ -4046,11 +4175,13 @@ msgstr ""
 "instalar si agregó medios HTTP / FTP antes de la selección de paquetes."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Si se perdió la configuración del método de entrada durante la instalación, "
 "puede acceder a ella después de arrancar el sistema instalado a través de "
@@ -4058,56 +4189,54 @@ msgstr ""
 "root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalar o actualizar"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalación"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Use esta opción para una nueva instalación de <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Actualización"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Si tiene una o más versiones de <application>Mageia</application> instaladas "
-"en su sistema, el instalador le permitirá actualizar una de ellas a la "
-"última versión."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Solamente se ha testado la actualización desde una versión de Mageia "
 "anterior que <emphasis>todavía está soportada</emphasis> cuando esta versión "
@@ -4116,16 +4245,17 @@ msgstr ""
 "limpia preservando su partición <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Si en cualquier momento durante la instalación decide parar el proceso, es "
 "posible reiniciar, pero piénselo dos veces. Una vez que una partición ha "
@@ -4136,12 +4266,14 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultáneamente para reiniciar"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Si ha descubierto que se le olvidó seleccionar un idioma adicional, puede "
 "volver desde la pantalla de \"Instalar o Actualizar\" a la de selección de "
@@ -4176,12 +4308,12 @@ msgstr ""
 "seleccionados."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4190,16 +4322,17 @@ msgstr ""
 "teclado compatible, elegirá el teclado estadounidense."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4217,22 +4350,24 @@ msgstr ""
 "Distribución_del_teclado</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Si su teclado no está en la lista que aparece, haga click en <guibutton>Más</"
 "guibutton> para mostrar una lista completa y seleccionar ahí su teclado."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Después de seleccionar un teclado desde la ventana de <guibutton>Más</"
 "guibutton>, el instalador volverá a la primera ventana de selección de "
@@ -4241,23 +4376,24 @@ msgstr ""
 "lista completa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Si selecciona un teclado basado en carácteres no latinos, aparecerá una "
 "pantalla extra preguntando como prefiere cambiar entre disposiciones latinas "
 "y no latinas."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Por favor elija un idioma"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4268,7 +4404,7 @@ msgstr ""
 "instalación y para su sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4277,12 +4413,13 @@ msgstr ""
 "durante la instalación y en su sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Si necesitara tener varios idiomas instalados para usted u otros usuarios, "
 "usa el botón de <guibutton>Múltiples idiomas</guibutton> para añadirlos "
@@ -4290,7 +4427,7 @@ msgstr ""
 "instalación."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4303,18 +4440,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Aunque elija más de un idioma, primero debe elegir su idioma preferido en la "
 "primera pantalla. También se marcará como elegido en la pantalla de elección "
 "de múltiples idiomas."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4323,23 +4461,24 @@ msgstr ""
 "también el idioma de su teclado."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia usa soporte UTF-8 (Unicode) por defecto."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Esto se puede desactivar en la pantalla \"múltiples idiomas\" si sabe que no "
 "es lo más apropiado para su idioma. Desactivar UFT-8 afecta a todos los "
 "idiomas instalados."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4393,68 +4532,73 @@ msgstr ""
 "más botones."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Agregando o modificando una entrada en el menú de arranque"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Para ello, necesita editar manualmente /boot/grub2/custom.cfg o usar el "
 "software grub-customizer (Disponible en los repositorios Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Para más información, vea nuestro wiki: <link ns2:href=\"https://wiki.mageia."
 "org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Interfaz del cargador de arranque"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: 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:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr "Grub2 (con o sin menú gráfico) para sistemas Legacy/MBR o Legacy/GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi para un sistema UEFI."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: 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:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 en sistemas Legacy/MBR y Legacy/GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4467,29 +4611,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "No modifique el \"Dispositivo de Arranque\" a menos que sepa realmente qué "
 "está hace."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi en sistemas UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que "
 "no se puede elegir entre con o sin menú gráfico"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4502,14 +4651,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Si Mageia es el único sistema instalado en su computadora, el instalador "
@@ -4521,36 +4671,41 @@ msgstr ""
 "operativos que tenga."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: 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:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Por defecto, según su sistema, Mageia escribe un nuevo:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 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:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Cargador de arranque Grub2-efi en el ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Si ya tiene instalados otros sistemas operativos, Mageia intentará "
 "agregarlos al nuevo menú de inicio de Mageia. Si no desea este "
@@ -4559,7 +4714,7 @@ msgstr ""
 "operativos</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4572,18 +4727,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: 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:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "El proceso exacto para añadir su sistema operativo Mageia al cargador de "
 "arranque existente están fuera del alcance de este manual, pero normalmente "
@@ -4592,23 +4748,24 @@ msgstr ""
 "sistema operativo en cuestión."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Carga en uso"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Si no desea un arranque de Mageia, sino que inicie desde otro SO, haga clic "
 "en <guibutton>Siguiente</guibutton>, luego en <guibutton>Avanzado</"
 "guibutton> y marque la casilla <guilabel>No toque ESP o MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4621,7 +4778,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4630,7 +4787,7 @@ msgstr ""
 "haciendo clic en <guibutton>Aceptar</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4639,33 +4796,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Primera página"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Retardo antes de arrancar la imagen predeterminada</guilabel>: "
 "Este cuadro de texto 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:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Seguridad</guilabel>: Permite establecer una contraseña para el "
 "gestor de arranque. Esto significa que se le pedirá un nombre de usuario y "
@@ -4674,37 +4832,37 @@ msgstr ""
 "es la elegida aquí después."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Contraseña</guilabel>: este cuadro de texto es donde se pone la "
 "contraseña"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Contraseña (de nuevo)</guilabel>: vuelva a escribir la contraseña "
 "y Drakx comprobará que coincide con la que se ha definido anteriormente."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Avanzado</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Habilitar ACPI:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) es un estándar para la administración de energía. Se puede "
@@ -4715,21 +4873,22 @@ msgstr ""
 "sistema)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Habilitar SMP</guilabel>: esta opción habilita / deshabilita el "
 "multiprocesamiento simétrico para procesadores multi-núcleo."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Habilitar APIC</guilabel>: Activar o desactivar esta opción le "
 "permite al sistema operativo acceder al Controlador de interrupción "
@@ -4737,29 +4896,30 @@ msgstr ""
 "más complejos y la gestión avanzada de IRQ (Solicitud de interrupción)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Habilitar APIC local</guilabel>: Aquí puede establecer APIC local, "
 "que administra todas las interrupciones externas para un procesador "
 "específico en un sistema SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Página siguiente"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Predeterminado:</guilabel> Sistema operativo iniciado de forma "
 "predeterminada"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4769,7 +4929,7 @@ msgstr ""
 "arranca."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4779,11 +4939,12 @@ msgstr ""
 "Mageia </link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Modo de video:</guilabel> Define el tamaño de la pantalla y la "
 "profundidad de color que utilizará el menú de arranque. Si hace clic en el "
@@ -4791,7 +4952,7 @@ msgstr ""
 "profundidad de color."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4800,7 +4961,7 @@ msgstr ""
 "linkend=\"setupChainLoading\">Uso de la cadena de arranque</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Configurando SCSI"
 
@@ -4813,20 +4974,22 @@ msgstr "Configurando SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"setupSCSI-im1\" /> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX suele detectar correctamente los discos duros. Con algunos "
 "controladores SCSI antiguos puede que no sea capaz de detectar los "
@@ -4834,16 +4997,17 @@ msgstr ""
 "duro."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Si pasa esto, necesitará \"mostrarle\" manualmente el disco duro SCSI que "
 "tenga."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "Después DrakX debería de poder configurar el(los) disco(s) correctamente."
@@ -4865,10 +5029,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "En esta pantalla aparece el nombre del driver que el instalador ha escogido "
 "para su tarjeta de sonido, que será el dado por defecto si es que hay alguno."
@@ -4891,10 +5055,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Entonces, en la pantalla de la herramienta de \"Configurar sonido\" de "
 "draksound, haga click en <guibutton>Avanzado</guibutton> y en "
@@ -4902,32 +5068,35 @@ msgstr ""
 "sobre cómo resolver el problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avanzado"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Hacer click en <guibutton>Avanzado</guibutton> en esta pantalla, durante la "
 "instalación, es útil si no hay un driver por defecto y hay varios "
 "disponibles, o si cree que el instalador escogió el driver equivocado."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "In ese caso, puede seleccionar un driver diferente tras hacer click en "
 "<guibutton>Escoger un driver</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirme el disco que va a formatear"
 
@@ -4938,13 +5107,13 @@ msgstr "Confirme el disco que va a formatear"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4954,17 +5123,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Haga click en <guibutton>Previo</guibutton> si no está seguro de su elección."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Haga click en <guibutton>Siguiente</guibutton> si está seguro y quiereborrar "
 "todas las particiones, sistemas operativos y datos de su disco duro."
@@ -5089,16 +5261,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Desinstalando Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Guias"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Si Mageia no le convence a usted o no puede instalar correctamente, en breve "
@@ -5106,28 +5274,30 @@ msgstr ""
 "posibilidad de desinstalar. Esto no es cierto para todos los sistemas "
 "operativos."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Después de la copia de seguridad de datos, reiniciar en su Mageia DVD y "
 "seleccione Sistema de Rescate, a continuación, en Restaurar el gestor de "
 "arranque de Windows. En el siguiente inicio, sólo tendrá Windows sin ningún "
 "menú para elegir el sistema operativo."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Para recuperar el espacio utilizado por las particiones de Mageia en "
 "Windows, haga clic en <code>Inicio -> Panel de control -> Herramientas "
@@ -5138,8 +5308,8 @@ msgstr ""
 "disco. Haga clic derecho sobre una de estas particiones y seleccione "
 "<guibutton>Eliminar</guibutton>."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5147,14 +5317,15 @@ 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><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Si tienes Vista o 7, tienes más de una posibilidad, se puede extender la "
 "partición existente que está a la izquierda del espacio libre. Hay otras "
@@ -5207,3 +5378,332 @@ 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 ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Contraseña (de nuevo)</guilabel>: Vuelva a escribir la "
+#~ "contraseña en este recuadro y Drakx comprobará que ha escrito la misma "
+#~ "que en el recuadro anterior."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Adicionalmente, puede activar o desactivar una cuenta de invitado."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Cualquier cosa que un usuario invitado (con <emphasis>rbash</emphasis>) "
+#~ "guarde en su directorio home será borrado cuando cierre sesión. El "
+#~ "invitado debe de guardar sus archivos importantes en una unidad USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Habilitar cuenta de invitado</guilabel>: Aquí puede habilitar o "
+#~ "inhabilitar la cuenta de invitado. La cuenta de invitado permite a un "
+#~ "usuario ocasional acceder y usar el PC, pero tiene un acceso más "
+#~ "restringido que los usuarios normales."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID de grupo</guilabel>: Aquí puede configurar el número de "
+#~ "identificación del grupo. También es un número, normalmente el mismo que "
+#~ "para el usuario. Déjelo vacío salvo que sepa lo que está haciendo."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Dispositivo\", está compuesto por: \"disco duro\", [\"número del disco "
+#~ "duro\"(letra)], \"número de partición\" (por ejemplo, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Estación de trabajo."
+
+#~ msgid "Server."
+#~ msgstr "Servidor."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Entorno gráfico."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "choosePackagesTree.png\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Hay cuatro grupos, haga click en el triángulo junto al grupo para "
+#~ "expandirlo y ver todos los servicios que contiene."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Si no puede encontrar su tarjeta en la lista de fabricantes (porque "
+#~ "todavía no se ha incluido en la base de datos o la tarjeta es vieja) "
+#~ "puede encontrar un controlador apropiado en la categoría de Xorg."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Hay una pestaña para cada disco duro o sistema de almacenaje detectados, "
+#~ "como una unidad USB. Por ejemplo, sda, sdb y sdc si se encuentran tres."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "El instalador compartirá el espacio disponible de acuerdo con las "
+#~ "siguientes reglas:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Alinear a\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Espacio libre que precede a (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Desde esta pantalla, se pueden concretar algunas preferencias."
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "El idioma (para la instalación solamente, puede ser diferente al lenguaje "
+#~ "elegido para el sistema) pulsando la tecla F2 (modo heredado solamente)."
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Aquí hay un ejemplo, la pantalla de bienvenida en Francés al emplear un "
+#~ "CD/DVD de tipo Live. Note que el menú de dicho DVD/CD no propone: "
+#~ "<guilabel>Sistema de recuperacion</guilabel>, <guilabel>Prueba de "
+#~ "Memoria</guilabel> ni <guilabel>Herramienta de deteccion de Hardware</"
+#~ "guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Añadir algunas opciones del núcle presionando \"F6\"  para el modo "
+#~ "heredado, o \"e\" para el modo UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Si la instalación falla, entonces puede ser necesario intentarlo de nuevo "
+#~ "usando alguna de las opciones extra. El menú que aparece al pulsar F6 "
+#~ "muestra la nueva línea <guilabel>Opciones de arranque</guilabel> y "
+#~ "propone cuatro opciones:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Añadir más opciones de kernel pulsando la tecla F1 (sólo modo Legacy)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Usando una red por cable"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Aquí está la pantalla de bienvenida por defecto cuando se una una "
+#~ "intalación por CD a través de una red por cable (imágenes netinstall.iso "
+#~ "o netinstall-nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "No se permite cambiar el idioma, las opciones están descritas en la "
+#~ "pantalla. Para mayor información relacionada a como usar el CD de "
+#~ "instalación basada en Red Alámbrica, visite <link ns2:href=\"https://wiki."
+#~ "mageia.org/en/Boot.iso_install\">el Wiki de Mageia</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "La distribución del teclado es la de un teclado Americano"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"../es/dx2-"
+#~ "installUpdates.png\" align=\"center\" xml:id=\"installUpdates-im1\" "
+#~ "format=\"PNG\" /> </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 ""
+#~ "Si se selecciona, \"Con X\" también incluirá el entorno de escritorio "
+#~ "ligero IceWM."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Aquí puede ajustar su nivel de seguridad."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "Si no sabe qué elegir, deje la configuración por defecto como está."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Sistema LIVE: puede iniciar su ordenador en un sistema real Mageia sin "
+#~ "instalarlo, para ver lo que obtendría tras una instalación. El proceso de "
+#~ "instalación es más sencillo, pero tiene menos opciones."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Medio CD sólo de arranque"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Marque el botón Guardar Archivo."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "También puede utilizar el comando \"dd\" en una consola:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Desconecta tu pendrive USB, esta echo"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Use esta opción para una nueva instalación de <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."
+#~ msgstr ""
+#~ "Si tiene una o más versiones de <application>Mageia</application> "
+#~ "instaladas en su sistema, el instalador le permitirá actualizar una de "
+#~ "ellas a la última versión."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"setupSCSI-im1\" /> </imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Guias"
diff --git a/docs/docs/stable/installer/et.po b/docs/docs/stable/installer/et.po
index 00a47b52..54f86108 100644
--- a/docs/docs/stable/installer/et.po
+++ b/docs/docs/stable/installer/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-25 20:24+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -29,12 +29,13 @@ msgstr "Litsents ja väljalaskemärkmed"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -67,8 +68,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Nõustumiseks valige lihtsalt <guilabel>Nõustun</guilabel> ja klõpsake siis "
@@ -90,22 +92,23 @@ msgstr "Väljalaskemärkmed"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Kui tunnete huvi, mida on <application>Mageia</application> käesolevas "
 "väljalaskes uut, klõpsake nupule <guibutton>Väljalaskemärkmed</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "et"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
@@ -113,23 +116,25 @@ msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Siin on näha juba tuvastatud andmekandjad ehk tarkvarahoidlad. Võite lisada "
 "ka teisi allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt või "
@@ -137,23 +142,25 @@ msgstr ""
 "järgmistel etappidel kasutada."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Võrguallika korral tuleb lisaks ette võtta järgmised sammud:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Valida ja aktiveerida võrk, kui see veel ei tööta."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Valida peegel või määrata URL (esimene kirje). Peegli valimisel saab "
 "kasutada kõiki Mageia määratud hoidlaid, sealhulgas mittevaba (nonfree) ja "
@@ -161,14 +168,15 @@ msgstr ""
 "määrates saab kasutada mõnda konkreetset hoidlat või omaenda NFS-allikat."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid "
 "rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides "
@@ -185,7 +193,7 @@ msgstr "Kasutajate ja administraatori haldamine"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,21 +206,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Administraatori (root) parooli määramine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Kõigi <application>Mageia</application> paigalduste korral on soovitatav "
 "määrata administraatori parool (Linuxis kasutatakse selle kohta tavaliselt "
@@ -224,9 +232,10 @@ msgstr ""
 "kirjutatud, neid kahte omavahel võrreldes."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Kõik paroolid on tõstutundlikud, see tähendab arvestavad väike- ja "
@@ -234,16 +243,18 @@ msgstr ""
 "väiketähti kui ka numbreid ja muid märke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Kasutaja lisamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Siin saab lisada kasutaja. Kasutajal on vähem õigusi kui administraatoril "
 "(root), kuid siiski piisavalt internetis liikumiseks, kontoritöörakenduste "
@@ -251,7 +262,7 @@ msgstr ""
 "arvutis teeb"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -260,7 +271,7 @@ msgstr ""
 "ikooni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -268,10 +279,11 @@ msgstr ""
 "<guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku nime."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Kasutajatunnus</guilabel>: siin saab kirja panna kasutajanime või "
@@ -279,40 +291,43 @@ msgstr ""
 "<emphasis>Kasutajatunnus on tõstutundlik.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Parool</guilabel>: siin saab kirja panna kasutaja parooli. "
 "Tekstikasti lõpus on kilp, mis näitab parooli tugevust (vt ka <xref linkend="
 "\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Parool (uuesti)</guilabel>: siia tuleb kirjutada teist korda "
-"kasutaja parool ning DrakX kontrollib, kas see on ikka sama, mis kirjutati "
-"ülal asuvasse kasti."
+"<guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
+"kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
+"mille sisestasid esimesel korral."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on nii "
 "lugemis- kui ka kirjutuskaitstud (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -321,86 +336,58 @@ msgstr ""
 "haldamine</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Ligipääsuõigusi saab mõistagi muuta ka pärast paigaldamist."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Põhjalikum kasutajate haldamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Nupule <guibutton>Muud valikud</guibutton> klõpsates ilmub ekraan, kus saab "
 "muuta lisatava kasutaja mõningaid seadistusi."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr " Samuti saab siin lubada või keelata külaliskonto."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Kõik, mida külaline oma vaikimisi <emphasis>rbash</emphasis> külaliskonto "
-"all /home-kataloogi salvestab, kustutatakse külalise väljalogimisel. Tähtsad "
-"failid peaks külaline salvestama USB-pulgale."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Külaliskonto (guest) lubamine</guilabel>: siin saab lubada või "
-"keelata külaliskonto. See võimaldab külalisel, kellele pole kasutajat "
-"loodud, sisse logida ja arvutit kasutada, kuid tema õigused on tavalise "
-"kasutajaga võrreldes palju piiratumad."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: selles rippmenüüs saab muuta shelli, mida "
 "kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on Bash, Dash ja Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Kasutaja ID</guilabel>: siin saab määrata eelmisel ekraanil "
 "lisatud kasutaja ID. See on arv. Kui te ei tea, milleks see hea on, ärge "
 "siia midagi kirjutage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grupi ID</guilabel>: siin saab määrata grupi ID. See on samuti "
-"arv, tavaliselt sama kasutaja ID-ga. Kui te ei tea, milleks see hea on, ärge "
-"siia midagi kirjutage."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
@@ -417,13 +404,14 @@ msgstr "Haakepunktide valimine"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -433,7 +421,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -444,41 +432,45 @@ msgstr ""
 "muuta."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Kui te ka midagi muudate, kontrollige alati, et teil jääks alles "
 "juurpartitsioon (<literal>/)</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Kõiki partitsioone näidatakse kujul \"Seade\" (\"Suurus\", \"Haakepunkt\", "
 "\"Tüüp\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Seade\" koosneb järgmistest elementidest: \"kõvaketas\", [\"kõvakettanumber"
-"\"(täht)], \"partitsiooninumber\" (näiteks \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Kui partitsioone on palju, saab neile haakepunkte valida rippmenüüst "
 "(näiteks <literal>/</literal>, <literal>/home</literal> ja <literal>/var)</"
@@ -487,27 +479,29 @@ msgstr ""
 "literal> cauldroni paigalduse <literal>/home</literal>-partitsiooni tarbeks."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Partitsioonide puhul, mida teil vaja ei lähe, võib haakepunkti määramata "
 "jätta."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Kui te pole kindel, mida valida, klõpsake <guibutton>Tagasi</guibutton> ning "
 "märkige <guilabel>Ketta jagamine oma tahtmist mööda</guilabel>. Ilmuval "
 "ekraanil saab partitsioonile klõpsates näha selle tüüpi ja suurust."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -769,8 +763,9 @@ msgstr "Töölaua valimine"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Sõltuvalt siin langetatud valikutest võite näha täiendavaid ekraane, kus "
@@ -778,8 +773,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -798,14 +794,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Siin saab valida, kas soovite kasutada <application>KDE</application> või "
 "<application>Gnome</application> töökeskkonda. Mõlemad pakuvad rakendusi ja "
@@ -831,8 +829,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -843,61 +842,68 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Tööjaam."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Graafiline keskkond."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Valik paketthaaval: selle valimisel saab pakette käsitsi lisada või "
 "eemaldada."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Juhiseid minimaalse paigalduse tegemiseks (nii X'i ja IceWM'iga kui ka ilma "
 "nendeta) annab <xref linkend=\"minimal-install\"/>."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Üksikpakettide valimine"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackagesTree."
-"png\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Siin saab oma paigaldust kohandada, lisades või eemaldades tarkvarapakette."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -912,47 +918,45 @@ msgstr ""
 "paigaldamise ajal sama nuppu ja faili laadides."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Teenuste seadistamine"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Siin saab määrata, millised teenused käivitada või mitte käivitada koos "
 "süsteemi alglaadimisega."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab grupi "
-"avada ja uurida selles peituvaid teenuseid."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Valikud, mille on langetanud DrakX, on tavaliselt mõistlikud ja head."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -961,7 +965,7 @@ msgstr ""
 "kohta."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Muutke siin midagi ainult siis, kui olete kindel, et teate, mida teete."
@@ -975,12 +979,13 @@ msgstr "Ajavööndi seadistamine"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -990,18 +995,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Määrake ajavöönd kindlaks, valides oma riigi või linna, mis asub samas "
 "ajavööndis teie lähedal."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Järgmisel ekraanil saab valida, kas riistvaraline kell on seatud kohalikule "
 "ajale või GMT-le ehk maailmaajale (UTC)."
@@ -1016,23 +1023,23 @@ msgstr ""
 "oleksid lültiatud kas kohalikule ajale või siis UTC/GMT-le."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "X-serveri valimine (graafikakaardi seadistamine)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_card_list."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_card_list-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
+"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1041,7 +1048,7 @@ msgstr ""
 "teie videoseadme korrektselt tuvastada."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1051,100 +1058,97 @@ msgstr ""
 "parameetrite alusel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "tootja"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "seejärel kaardi nimi"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "ja lõpuks kaardi tüüp"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
-"andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
-"draiveri Xorg-i kategoorias."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg-i nimekiri pakub üle 40 üldise avatud lähtekoodiga videokaardi "
 "draiveri. Kui te ikkagi ei suuda oma kaardile sobivat draiverit siit leida, "
 "võite valida Vesa draiveri, mis pakub kõige elementaarsemaid võimalusi."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Arvestage kindlasti, et kui valite sobimatu draiveri, võite saada kasutada "
 "ainult käsurida."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Mõned videokaartide tootjad pakuvad Linuxile omanduslikke draivereid, mis "
 "võivad olla saadaval ainult Nonfree tarkvarahoidlas, mõnel juhul isegi "
 "kõigest tootja enda veebileheküljel."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree hoidlad tuleb kasutamiseks spetsiaalselt lubada.  Seda saab teha "
 "pärast arvuti esimest taaskäivitamist."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Graafikakaardi ja monitori seadistamine"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_chooser."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_chooser-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Sõltumata sellest, millise graafilise keskkonna ehk töökeskkonna olete "
 "otsustanud oma <application>Mageia</application> paigaldusele valida, "
@@ -1157,7 +1161,7 @@ msgstr ""
 "arvate, et valik ei ole õige."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1166,13 +1170,14 @@ msgstr ""
 "korral loetelust oma kaart."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: valida saab "
 "<guilabel>Plug'n Play</guilabel>, kui see sobib, või siis vajaliku monitori "
@@ -1181,30 +1186,31 @@ msgstr ""
 "paika panna oma monitori realaotus- ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Väärad sagedused võivad monitori kahjustada."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Ekraanilahutus</guibutton></emphasis>: siin saab "
 "määrata vajaliku monitori ekraanilahutuse ja värvisügavuse."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: testimisnuppu paigaldamise "
 "ajal alati ei näe. Kui see on näha, siis saab sellele vajutades kontrollida "
@@ -1215,7 +1221,7 @@ msgstr ""
 "kontrollige eriti hoolikalt, et kõik seadistused oleksid korras.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1224,12 +1230,12 @@ msgstr ""
 "mitmesuguseid valikuid lubada või keelata."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Monitori valimine"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1238,12 +1244,13 @@ msgstr ""
 "teie monitori õigesti."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Teistsuguste parameetritega monitori valimine võib kahjustada "
 "monitori või videoriistvara. Palun ärge proovige lihtsalt huvi pärast "
@@ -1251,23 +1258,23 @@ msgstr ""
 "Kahtluste korral uurige oma monitori dokumentatsiooni."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Kohandatud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1278,7 +1285,7 @@ msgstr ""
 "realaotussageduse ja ekraaniuuendussageduse."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1291,12 +1298,12 @@ msgstr ""
 "tagasihoidlikum väärtus ja kindlasti uurige monitori dokumentatsiooni."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1305,12 +1312,12 @@ msgstr ""
 "andmebaasi põhjal."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Tootja</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1320,28 +1327,30 @@ msgstr ""
 "parameetrite alusel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "monitori nimi"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "monitori kirjeldus"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Tavaline</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Selles grupis on valida ligemale 30 seadistuse seast, näiteks 1024x768 @ "
 "60Hz, sealhulgas lamekuvarid (Flat panel), mida kasutavad eriti sülearvutid. "
@@ -1350,12 +1359,12 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1366,12 +1375,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Kui soovite krüptida oma <literal>/</literal> partitsiooni, peab teil "
 "kindlasti olema ka eraldi <literal>/boot</literal> partitsioon. <literal>/"
@@ -1379,43 +1390,44 @@ msgstr ""
 "ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
 "partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-pulgale, "
-"on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui teil juhtub "
-"olema kolm salvestusseadet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Kõigi valitud salvestusseadme partitsioonide kustutamiseks valige "
 "<guibutton>Kustuta kõik</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
 "Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
@@ -1424,32 +1436,34 @@ msgstr ""
 "lisamine või partitsiooni tüübi valimine."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI süsteemne "
 "partitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/EFI (vt "
 "tagapool)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1457,12 +1471,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1471,7 +1485,7 @@ msgstr ""
 "tüübiga BIOS-e alglaadimispartitsioon on ikka olemas."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1484,32 +1498,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitsioneerimine"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Sellel ekraanil näete oma kõvaketta või -ketaste sisu ning lahendusi, mida "
 "DrakXi partitsioneerimisnõustaja pakub <application>Mageia</application> "
 "paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Pakutavad valikud sõltuvad teie kõvaketaste konkreetsest ülesehitusest ja "
 "sisust."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1522,12 +1538,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Olemasolevate partitsioonide kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1536,12 +1552,12 @@ msgstr ""
 "neid võib kasutada paigaldamiseks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Vaba ruumi kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1550,12 +1566,12 @@ msgstr ""
 "uuele Mageia paigaldusele."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1564,7 +1580,7 @@ msgstr ""
 "paigaldusprogramm seda kasutada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1575,7 +1591,7 @@ msgstr ""
 "kõigist olulistest failidest varukoopia!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1592,12 +1608,14 @@ msgstr ""
 "äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi "
 "partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning "
@@ -1606,37 +1624,39 @@ msgstr ""
 "Seda näitab allolev pilt."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Kogu ketta tühjendamine ja kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
 "ettevaatlik!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1646,12 +1666,12 @@ msgstr ""
 "kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Ketta jagamine oma tahtmist mööda"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1660,66 +1680,80 @@ msgstr ""
 "või -ketastel paigaldatakse."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon / jaoks "
 "ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "ülejäänu (vähemalt 12/19) eraldatakse /home jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm "
 "partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne "
 "partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas /boot/"
@@ -1727,13 +1761,14 @@ msgstr ""
 "kontrollida, kas seda on õigesti tehtud."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb "
 "luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB "
@@ -1742,7 +1777,7 @@ msgstr ""
 "valige failisüsteemiks BIOS boot partition."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1753,7 +1788,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1762,15 +1797,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Mõned uuemad kettad kasutavad nüüd 4096-baidiseid loogilisi sektoreid "
 "varasema standardi, 512-baidiste sektorite asemel. Sobiva riistvara "
@@ -1781,19 +1817,22 @@ msgstr ""
 "gparted."
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Align to\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Samuti kontrollige, et kõigi loodud partitsioonide suurus megabaitides oleks "
 "paarisarv."
@@ -1804,7 +1843,7 @@ msgid "Installation from LIVE medium"
 msgstr "Paigaldamine Live-andmekandjalt"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1819,18 +1858,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia ametlik dokumentatsioon"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1842,7 +1881,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1854,7 +1893,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1867,13 +1906,13 @@ msgstr ""
 "\">dokumentatsioonimeeskonnaga</link>."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1885,26 +1924,34 @@ msgstr ""
 "langetatud valikutest."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Paigaldamine DrakX'i abil"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Veebruar 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1912,7 +1959,7 @@ msgstr "Õnnitleme!"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1921,7 +1968,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1932,16 +1979,17 @@ msgstr ""
 "taaskäivitada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Pärast taaskäivitamist saab alglaaduri ekraanil valida käivitatava "
 "operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1950,12 +1998,12 @@ msgstr ""
 "automaatselt teie uus Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Tundke rõõmu ja nautige!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1970,11 +2018,12 @@ msgstr "Tulemüür"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Siin saab paika panna mõned lihtsad tulemüüri reeglid, mis määravad kndlaks, "
 "millist laadi teavet internetist sihtsüsteem vastu võtab. See omakorda "
@@ -1982,15 +2031,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Vaikimisi ei ole ükski nupp märgitud, mis tähendab, et võrgust ei ole "
 "kättesaadav ükski süsteemi teenus. Nupul <emphasis>Kõik (tulemüür puudub)</"
@@ -2003,10 +2053,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Kõigi muude märkekastide juures olev tekst peaks enda eest rääkima. Näiteks "
 "on mõtet märkida \"CUPS-i server\", kui soovite, et masinaga ühendatud "
@@ -2019,12 +2070,11 @@ msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "Märkekastid võimaldavad sisse või välja lülitada ainult kõige levinumaid "
 "teenuseid. Nupuga \"Muud valikud\" saab lubada või keelata ka neid "
@@ -2033,12 +2083,12 @@ msgstr ""
 "teenuseid, kui kirjutada need tühikutega eraldatult järgmiselt"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;pordi-number>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2049,7 +2099,7 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2058,7 +2108,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - teenuse kasutatav internetiprotokoll."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2067,7 +2117,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2076,7 +2126,7 @@ msgstr ""
 "2 määrata."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Vormindamine"
 
@@ -2085,14 +2135,14 @@ msgstr "Vormindamine"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2102,23 +2152,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Siin saab valida, millised partitsioonid vormindada. Kõik andmed "
 "partitsioonidel, mis <emphasis>ei ole</emphasis> vormindamiseks märgitud, "
 "säilivad."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Üldjuhul on vaja vormindada vähemalt partitsioonid, mille DrakX on valinud."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2127,12 +2178,13 @@ msgstr ""
 "millel kontrollitakse niinimetatud <emphasis>riknenud plokke.</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Kui te pole kindel, et olete langetanud õige valiku, klõpsake "
 "<guibutton>Tagasi</guibutton>, veel kord <guibutton>Tagasi</guibutton> ja "
@@ -2140,7 +2192,7 @@ msgstr ""
 "saate uurida, mis partitsioonidel leidub."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2149,12 +2201,12 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2165,7 +2217,7 @@ msgstr ""
 "uuendamine oleks kõigile võimalikult lihtne."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2174,36 +2226,40 @@ msgstr ""
 "paigaldusprogrammi, mida tavaliselt ongi vaja."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Paigaldusprogrammi avaekraan"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Mageia DVD kasutamine"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb UEFI "
 "süsteemi, teist pärandsüsteemi korral."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Sellel ekraanil pääseb valikute juurde, kui vajutada tähte \"e\", mis avab "
 "redigeerimisrežiimi. Nähtavale ekraanile tagasipääsemiseks vajutage klahvi "
@@ -2211,113 +2267,107 @@ msgstr ""
 "väljuda tehtud valikuid salvestades."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Sellel ekraanil on võimalik määrata mõned isiklikud eelistused:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Keel (ainult paigaldamiseks, võib erineda süsteemile valitavast keelest) "
-"klahvile F2 vajutades (ainult tavapärases süsteemis)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Valige nooleklahvidega liikudes keel ja vajutage klahvile Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Siin on näiteks LiveDVD/CD eestikeelne tervitusekraan. Pange tähele, et "
-"LiveDVD/CD menüüs ei ole kirjeid, nagu <guilabel>Päästesüsteem</guilabel>, "
-"<guilabel>Mälu testimine</guilabel> ja <guilabel>Riistvara tuvastamise "
-"tööriist</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Valige nooleklahvidega liikudes keel ja vajutage klahvile Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Muuta ekraanilahutust klahvile F3 vajutades (ainult tavapärases süsteemis)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis role=\"bold"
-"\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold\">e</"
-"emphasis> UEFI süsteemi korral."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Vaikimisi, mille korral vaikimisi võtmeid ei muudeta."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale tekstirea "
-"<guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Vaikimisi, mille korral vaikimisi võtmeid ei muudeta."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr "- Ilma ACPI-ta, mille korral toitehalduse valikuid ei arvestata."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Ilma kohaliku APIC-ta, mis puudutab CPU katkestusi. Valige see siis, kui "
 "seda nõutakse."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2326,55 +2376,52 @@ msgstr ""
 "<guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Mõne Mageia väljalaske puhul võib juhtuda, et klahviga F6 valitud kirjeid ei "
 "näe real <guilabel>Alglaadimise sätted</guilabel>, aga neid siiski "
 "arvestatakse."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult tavapärases "
-"süsteemis)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Klahvile F1 vajutades ilmub uus aken saadaolevate võtmetega. Valige neist "
 "vajalik nooleklahvidega ja vajutage klahvile Enter üksikasjade nägemiseks "
 "või klahvile Esc tervitusekraani juurde naasmiseks."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage "
 "klahvile Esc või valige <guilabel>Tagasi alglaadimise sätete juurde</"
@@ -2382,19 +2429,22 @@ msgstr ""
 "reale <guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Abi tõlgitakse keelde, mis on valitud klahviga F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2405,81 +2455,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Juhtmega võrgu kasutamine"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
-"(netinstall.iso või netinstall-nonfree.iso tõmmis) kasutamisel:"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud ekraanil. "
-"Rohkem teavet juhtmega võrgu põhise paigaldamise CD kasutamise kohta leiab "
-"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia "
-"Wikist</link>."
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Klaviatuuripaigutus on Ameerika-pärane."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Paigaldamise etapid"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Paigaldamine on jagatud mitmeks etapiks, mille loetelu näeb ekraani "
 "külgpaneelil."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Igal etapil kohtate üht või enamat ekraani, millel võib olla ka nupp "
 "<guibutton>Muud valikud</guibutton>, mis avab täiendavad ja harvemini "
 "vajalikud valikud."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Enamikul ekraanidel on nupp <guibutton>Abi</guibutton>, mis selgitab antud "
 "etappi põhjalikumalt."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2497,17 +2514,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2518,13 +2535,16 @@ msgstr ""
 "ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Kui riistvara on väga vana, ei pruugi graafiline paigaldamine üldse võimalik "
 "olla. Sel juhul võib proovida tekstipõhist paigaldamist. Selleks vajutage "
@@ -2533,12 +2553,12 @@ msgstr ""
 "\" ja vajutage ENTER. Nüüd saate jätkata tekstipõhise paigaldamisega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2553,14 +2573,15 @@ msgstr ""
 "võtmetega."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM-i probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2571,18 +2592,20 @@ msgstr ""
 "<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dünaamilised partitsioonid"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all \"dynamic"
 "\" tavalise \"basic\" asemel, siis arvestage, et Mageiat ei saa sellisele "
@@ -2601,17 +2624,18 @@ msgstr "Uuendused"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2620,10 +2644,11 @@ msgstr ""
 "mõningaid pakette uuendatud või parandatud."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Valige <guilabel>Jah</guilabel>, kui soovite sellised paketid alla laadida "
@@ -2631,8 +2656,9 @@ msgstr ""
 "kui teil puudub parajasti internetiühendus."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><info><title>
@@ -2689,18 +2715,18 @@ msgstr "Andmekandjate valik (mittevaba tarkvara)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2713,7 +2739,7 @@ msgstr ""
 "etappidel võimalik paigaldada."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2722,7 +2748,7 @@ msgstr ""
 "see sisaldab distributsiooni põhikomponente."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2737,13 +2763,14 @@ msgstr ""
 "draivereid, mitmesuguste WiFi-kaartide püsivara jms."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Hoidla <emphasis>Tainted</emphasis> (piirangutega tarkvara) sisaldab "
 "pakette, mis on avaldatud vaba litsentsi all. Peamine põhjus, miks osa "
@@ -2753,36 +2780,39 @@ msgstr ""
 "multimeediakoodekid, kommerts-video-DVD-de esitamiseks vajalikud paketid jms."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimaalne paigaldus"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Kui paketigruppide ekraanil jätta kõik valimata, saab kasutada minimaalset "
 "paigaldust, vt. <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Soovi korral võite samal ekraanil ära märkida valiku \"Valik paketthaaval\"."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Minimaalne paigaldus on mõeldud neile, kel mõlgub <application>Mageia</"
 "application> jaoks meeles midagi erilist, näiteks server või spetsiaalne "
@@ -2790,24 +2820,24 @@ msgstr ""
 "valimisega, vt. <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Kui valite niisuguse paigaldamise, saab järgmisel ekraanil üht-teist "
 "täpsustada, näiteks lasta paigaldada ka dokumentatsioon või X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Kui märkida \"X'iga\", paigaldatakse ka kergekaaluline töökeskkond IceWM."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2821,15 +2851,15 @@ msgstr ""
 "gnu.org/software/coreutils/manual/\">GNU coreutils</link> info-lehekülgi."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2846,11 +2876,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX langetab teie süsteemi seadistamisel mõistlikud otsused vastavalt Teie "
 "valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata "
@@ -2858,9 +2889,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Rusikareeglina on soovitatav kasutada vaikimisi seadistusi - välja arvatud "
 "kolmel erandjuhul:"
@@ -2877,72 +2909,76 @@ msgstr "vaikeseadistusi on juba proovitud ja need ei andnud soovitud tulemust"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "veel midagi, millest on üksikasjalikumalt juttu allpool"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Süsteemi parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Ajavöönd</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX määrab vastavalt valitud keelele ajavööndi. Soovi korral saab seda "
 "muuta. Vt ka <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Riik / Piirkond</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Kui Te ei viibi valitud riigis, on väga oluline see siin õigeks parandada. "
 "Vt <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Alglaadur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX langetab tavaliselt alglaaduri osas hea ja õige valiku."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr ""
 "Kui Te just väga täpselt ei tea, kuidas Grub2 seadistada, ei tasu siin "
 "midagi muuta."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Kasutajate haldamine</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2951,21 +2987,22 @@ msgstr ""
 "home</literal> kataloogi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Teenused</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Süsteemi teenused tähendavad väikseid programme, mis töötavad taustal "
 "(deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2974,31 +3011,32 @@ msgstr ""
 "arvuti enam korralikult töötada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Riistvara parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klaviatuur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Siin saab määrata või muuta klaviatuuripaigutust, mis sõltub valitud "
 "asukohast, keelest ja klaviatuuritüübist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3007,12 +3045,12 @@ msgstr ""
 "pidage meeles, et muutuvad ka paroolid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Hiir</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3021,38 +3059,39 @@ msgstr ""
 "puuteplaate jms."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Helikaart</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Paigaldusprogramm kasutab vaikimisi draiverit, kui see on olemas. Võimalus "
 "valida teist draiverit antakse ainult siis, kui helikaardile on olemas mitu "
 "draiverit, aga ükski neist ei ole vaikimisi draiver."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Graafiline kasutajaliides</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "Siin saab seadistada graafikakaarte ja monitore."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Täpsemalt kõneleb sellest <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3061,20 +3100,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Võrgu- ja internetiparameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Võrk</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3084,21 +3124,22 @@ msgstr ""
 "mittevaba tarkvara hoidlate kasutamist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Võrgukaardi lisamisel ärge unustage seadistamast tulemüüri, et ka lisatud "
 "kaarti jälgitaks."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Puhverserverid</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3108,26 +3149,27 @@ msgstr ""
 "panna arvuti kasutama puhverservereid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Vajalike parameetrite täpsustamiseks võib olla vajalik pidada nõu oma "
 "süsteemiadministraatoriga."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Turvalisus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Turbetase</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3136,17 +3178,17 @@ msgstr ""
 "kasutamiseks kõlbama vaikimisi seadistused (valik Standardne)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Valige tase, mis paistab Teie vajadusi kõige paremini rahuldavat."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tulemüür</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3155,7 +3197,7 @@ msgstr ""
 "röövloomade vahel, kes üritavad neid varastada või rikkuda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3166,7 +3208,7 @@ msgstr ""
 "vt <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik."
@@ -3235,41 +3277,73 @@ msgstr ""
 "<application>Mageia</application> paigaldusele."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Turbetase"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsiooni suurus:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Siin saab kohandada oma arvuti turbetaset."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Muud valikud</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
-"vaikimisi määratu."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Pärast paigaldamist on alati võimalik turvalisusega seotud seadistusi muuta "
 "Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
@@ -3286,25 +3360,27 @@ msgstr "Sissejuhatus"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks just sellist "
 "tõmmist, mis vastab teie vajadustele."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Andmekandjaid on kaht tüüpi:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassikaline paigaldusandmekandja. Selle käivitamise järel asutakse kohe "
 "paigaldamise juurde ning te saate valida, mida paigaldada ja kuidas süsteemi "
@@ -3313,82 +3389,86 @@ msgstr ""
 "hakata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia "
-"süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse pakutakse. "
-"Paigaldamine on lihtsam, aga ka valikuid on vähem."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Üksikasjadest kõneldakse järgmistes osades."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Andmekandjad"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Määratlus"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Me nimetame siinkohal andmekandjaks ISO-tõmmisefaili, mis võimaldab "
 "paigaldada ja/või uuendada Mageiat, ning ühtlasi ka igasugust füüsilist "
 "seadet, millele ISO-tõmmis on kopeeritud."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "ISO-tõmmised leiab <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">siit</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassikalised paigaldusandmekandjad"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Ühised omadused"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Kasutavad traditsioonilist paigaldusprogrammi drakx"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3397,12 +3477,12 @@ msgstr ""
 "riistvara tuvastamise tööriist"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Iga DVD sisaldab paljusid saadaolevaid töökeskkondi ja keeli"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3410,99 +3490,104 @@ msgstr ""
 "mitte"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live-andmekandjad"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale "
 "paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Iga ISO sisaldab ainult üht töökeskkonda (Plasma, GNOME või Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">LiveISO-sid saab kasutada ainult puhta paigalduse, "
 "mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Sisaldavad mittevaba tarkvara"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Plasma LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Ainult Plasma töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Sisaldab kõiki keeli"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Ainult 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "GNOME LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Ainult GNOME töökeskkond"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Ainult 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Xfce LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Ainult Xfce töökeskkond."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32- või 64-bitine arhitektuur"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "CD-d ainult alglaadimiseks"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3513,28 +3598,30 @@ msgstr ""
 "muul kohalikul kettal, kohalikus võrgus või internetis."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui "
 "internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on "
 "ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Ainult inglise keeles"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3568,11 +3655,12 @@ msgstr "Allalaadimine"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või "
 "BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks "
@@ -3586,10 +3674,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada "
 "tuleks ainult üht neist. Hoidke üks neist varuks <link linkend=\"integrity"
@@ -3602,8 +3691,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Märkige raadionupp Salvestama."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3611,14 +3700,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Allalaaditud andmekandja terviklikkuse kontrollimine"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Mõlemad kontrollsummad on kuueteistkümnendarvud, mis arvutatakse kindla "
 "algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti "
@@ -3628,68 +3718,83 @@ msgstr ""
 "laadida või püüda see BitTorrenti abil parandada."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Avage konsool (selleks ei pea olema administraator) ja kirjutage:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- md5sum kasutamiseks: [minukonto@localhost]$ <userinput>md5sum tõmmisefail."
 "iso/asukoht</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- sha1sum kasutamiseks: [minukonto@localhost]$ <userinput>sha1sum "
 "tõmmisefail.iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
-"allalaadimissaidil näidatuga:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
+"allalaadimissaidil näidatuga:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "ISO kirjutamine"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei "
 "ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO kirjutamine CD-le või DVD-le"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et "
 "seade oleks määratud <emphasis role=\"bold\">kirjutama tõmmist</emphasis>, "
@@ -3697,12 +3802,12 @@ msgstr ""
 "wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "ISO kirjutamine USB-pulgale"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3711,18 +3816,19 @@ msgstr ""
 "pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Tõmmise kirjutamine USB-pulgale hävitab kõik varasemad failisüsteemid "
 "seadmes, kõik andmed lähevad kaotsi ja partitsiooni suurus väheneb tõmmise "
 "suurusele."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3730,12 +3836,12 @@ msgstr ""
 "Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja vormindada."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Graafilise tööriista kasutamine Mageias"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3745,73 +3851,72 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Graafilise tööriista kasutamine Windowsis"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Võite proovida järgmisi programme:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "valikuga \"ISO image\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Käsurea kasutamine GNU/Linuxi süsteemis"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti anda, "
 "võib ketta partitsiooni sootuks üle kirjutada."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Samuti võib kasutada konsoolis tööriista dd:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Avage konsool"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Võtke administraatori õigused käsuga <userinput>su -</userinput> (ärge "
 "unustage kriipsukest lõpus)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3820,28 +3925,40 @@ msgstr ""
 "rakendust või failihaldurit, mis seda lugeda võiks)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Sisestage käsk <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
+"selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb "
 "seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul "
 "<emphasis>sdd</emphasis>:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3883,46 +4000,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
-"selleks <code>/dev/sdb</code>, mis on 8 GB suurune USB-pulk."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Sisestage käsk # <userinput>dd if=ISO-faili/asukoht of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "kus X on teie seadme nimi, nt: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Näide: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Sisestage käsk: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Eemaldage USB-pulk, kõik on valmis"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3952,19 +4078,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Kui teie riiki nimekirjas pole, klõpsake nupule <guilabel>Muud valikud</"
 "guilabel> ja valige oma riik / piirkond sealt."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Kui teie riik esineb ainult <guilabel>muude valikute</guilabel> nimekirjas, "
@@ -3973,18 +4101,19 @@ msgstr ""
 "arvestab teie tegeliku valikuga."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Sisestusmeetod"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "<guilabel>Muude riikide</guilabel> ekraanil saab ka valida sisestusmeetodi "
@@ -3995,67 +4124,67 @@ msgstr ""
 "neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
 "pärast paigaldatud süsteemi laadimist, valides \"Arvuti seadistamine\" -> "
 "\"Süsteem\" või käivitades administraatorina localedrake'i."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Paigaldamine või uuendamine"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Paigaldamine"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Selle valimisel saab ette võtta uue <application>Mageia</application> "
-"paigaldamise."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Uuendamine"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Kui teie süsteemi on juba varem paigaldatud <application>Mageia</"
-"application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
-"uuendada."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Põhjalikult testitud on uuendamine ainult selliselt varasemalt Mageia "
 "versioonilt, mis oli <emphasis>veel toetatud</emphasis> ajal, mil ilmus "
@@ -4066,16 +4195,17 @@ msgstr ""
 "literal>-partitsioon)."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Kui soovite mingil hetkel paigaldamise katkestada, võite ka teha arvutile "
 "taaskäivituse, aga palun mõelge enne seda hoolikalt järele. Kui partitsioon "
@@ -4087,12 +4217,14 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton>"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Kui avastate, et olete unustanud mõne keele lisada, saab \"Paigaldamise või "
 "uuendamise\" ekraanilt naasta keelevaliku juurde, vajutades korraga klahve "
@@ -4126,12 +4258,12 @@ msgstr ""
 "Vaikimisi valitu vastab keelele ja ajavööndile, mille varem valisite."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4140,16 +4272,17 @@ msgstr ""
 "leita, kasutatakse vaikimisi US klaviatuuripaigutust."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4166,22 +4299,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Kui teie klaviatuuri nimekirjas ei ole, klõpsake täieliku loetelu nägemiseks "
 "<guibutton>Veel</guibutton> ja valige oma klaviatuur sealt."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Olles valinud klaviatuuri pärast nupule <guibutton>Veel</guibutton> "
 "klõpsamist, võite esimese dialoogi juurde naastes näha, nagu oleks valitud "
@@ -4189,23 +4324,24 @@ msgstr ""
 "ikkagi seda, millise klaviatuuri te tegelikult täisnimekirjas olete valinud."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Kui valite klaviatuuri, mis ei kasuta ladina tähti, näete lisadialoogi, mis "
 "palub määrata, kuidas eelistate lülituda ladina ja mitteladina "
 "klaviatuuripaigutuste vahel."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Kasutatava keele valimine"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4216,7 +4352,7 @@ msgstr ""
 "paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4225,12 +4361,13 @@ msgstr ""
 "valikut nii paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Kui teie süsteemi tuleks paigaldada mitu keelt kas teie enda või teiste "
 "kasutajate tarbeks, siis tuleks nupule <guibutton>Mitme keele valimine</"
@@ -4238,7 +4375,7 @@ msgstr ""
 "keelte lisamine juba palju keerulisem."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4251,17 +4388,18 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Isegi kui paigaldate mitu keelt, tuleb üks neist valida esimesel ekraanil "
 "eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4270,23 +4408,24 @@ msgstr ""
 "paigaldada kohe ka klaviatuurile vastav keel."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia toetab vaikimisi UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Selle võib keelata \"mitme keele valimise\" ekraanil, kui olete kindel, et "
 "see teie keelele kohe üldse ei sobi. UTF-8 keelamine rakendub kõigile "
 "paigaldatavatele keeltele."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4338,69 +4477,74 @@ msgstr ""
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Selleks tuleb käsitsi muuta faili /boot/grub2/custom.cfg või kasutada "
 "rakendust grub-customizer (selle leiab Mageia tarkvarahoidlast)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Täpsemat teavet annab meie wiki: <link ns2:href=\"https://wiki.mageia.org/en/"
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Alglaaduri liides"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Vaikimisi kasutab Mageia üht kahest võimalusest:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (graafilise menüüga või ilma selleta) pärand/MBR või pärand/GPT "
 "süsteemi korral"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi UEFI süsteemi korral"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia graafiline menüü näeb kena välja :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 pärand/MBR ja pärand/GPT süsteemis"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4413,29 +4557,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
 "mida teete."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi UEFI süsteemis"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
 "valida graafilise menüü kasutamist või kasutamata jätmist."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4448,14 +4597,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Kui Mageia on ainuke süsteem, mis on teie arvutisse paigaldatud, loob "
@@ -4467,36 +4617,41 @@ msgstr ""
 "palju on arvutis operatsioonisüsteeme."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Mageia alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Vaikimisi kirjutab Mageia sõltuvalt süsteemist uue:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "Grub2 alglaaduri kas Teie esimese kõvaketta MBR-i (Master Boot Record) või "
 "BIOS-e alglaadepartisioonile"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi alglaaduri ESP-le"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Kui arvutisse peaks olema paigaldatud teisigi operatsioonisüsteeme, püüab "
 "Mageia lisada need oma alglaadimismenüüsse. Kui Te seda ei soovi, klõpsake "
@@ -4504,7 +4659,7 @@ msgstr ""
 "<guilabel>Võõraste operatsioonisüsteemide otsimine</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4517,18 +4672,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
 "väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
@@ -4537,16 +4693,17 @@ msgstr ""
 "dokumentatsiooni."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Ahellaadimise kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida mõnest "
 "teisest operatsioonisüsteemist, siis klõpsake <guibutton>Järgmine</"
@@ -4554,7 +4711,7 @@ msgstr ""
 "<guilabel>ESP-i ega MBR-i ei puudutata</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4567,7 +4724,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4576,7 +4733,7 @@ msgstr ""
 "<guibutton>Olgu</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4585,33 +4742,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Valikud"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Esimene kaart"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Ooteaeg alglaadimisel</guilabel>: selles kastis saab panna paika, "
 "kui mitu sekundit oodatakse, enne kui käivitatakse vaikimisi "
 "operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Turvalisus</guilabel>: siin saab määrata alglaaduri parooli. "
 "Sellisel juhul küsitakse alglaadimise ajal kasutajanime ja parooli, kui "
@@ -4619,37 +4777,37 @@ msgstr ""
 "on \"root\", parooli saate siin ise määrata."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Parool</guilabel>: selles kastis saab parooli kindlaks määrata."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Parool (uuesti)</guilabel>: siia tuleb parool teist korda "
 "kirjutada, mille järel Drakx kontrollib, kas see ikka sobib kokku sellega, "
 "mille sisestasid esimesel korral."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Edasijõudnuile</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI lubamine:</guilabel> ACPI (täiustatud konfiguratsiooni- ja "
 "toiteliides) on toitehalduse standard. See võib säästa energiat, lülitades "
@@ -4659,21 +4817,22 @@ msgstr ""
 "taaskäivitusi või süsteemi hangumisi)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP lubamine</guilabel>: see valik lülitab sisse või välja "
 "sümmeetrilise mitmiktöötluse mitme tuumaga protsessorite korral."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC lubamine</guilabel>: selle lubamine või keelamine annab "
 "operatsioonisüsteemile või võtab sellelt ligipääsu täiustatud "
@@ -4682,28 +4841,29 @@ msgstr ""
 "(katkestusnõuded) haldamist."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Kohaliku APIC lubamine</guilabel>: siin saab lubada või keelata "
 "kohaliku APIC, mis haldab kõiki konkreetse protsessori väliseid katkestusi "
 "SMP-süsteemis."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Järgmine kaart"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Vaikimisi:</guilabel> vaikimisi käivitatav operatsioonisüsteem."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4712,7 +4872,7 @@ msgstr ""
 "teavet või lasta kernelil alglaadimise ajal anda rohkem teavet."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4722,18 +4882,19 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Videorežiim:</guilabel> siin saab määrata ekraani suuruse ja "
 "värvisügavuse, mida alglaadur kasutab. Allapoole kolmnurgale klõpsates saab "
 "vaiida muute suuruse ja värvisügavuse valikute seast."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4742,7 +4903,7 @@ msgstr ""
 "osa <link linkend=\"setupChainLoading\">Ahellaadimise kasutamine</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
@@ -4755,36 +4916,39 @@ msgstr "SCSI seadistamine"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX tuvastab tavaliselt kõvakettad korrektselt. Mõne vanema SCSI "
 "kontrolleri korral aga ei suudeta korrektselt tuvastada vajalikku draiverit "
 "ja seetõttu ka ketast ära tunda."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Kui nii peaks juhtuma, tuleb DrakX-ile käsitsi selgeks teha, millised SCSI "
 "seadmed teil on."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 
@@ -4805,10 +4969,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Siin näeb draiveri nime, mille paigaldusprogramm on välja valinud teie "
 "helikaardile ja millest saab vaikimisi draiver."
@@ -4830,10 +4994,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Seejärel klõpsake draksoundi ehk \"Heli seadistamise\" tööriistas nupule "
 "<guibutton>Muud valikud</guibutton> ja seejärel nupule <guibutton>Probleemi "
@@ -4841,32 +5007,35 @@ msgstr ""
 "saada."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Muud valikud"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Klõpsamisest nupule <guibutton>Muud valikud</guibutton> võib paigaldamise "
 "ajal abi olla, kui vaikimisi draiverit ei ole, küll on aga saada mitu "
 "draiverit ning te arvate, et paigaldusprogramm on valinud neist vale."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Sellisel juhul saate valida mõne muu draiveri, kui klõpsate nupule "
 "<guibutton>Suvalise draiveri valimine</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
@@ -4877,13 +5046,13 @@ msgstr "Kõvaketta vormindamise kinnitamine"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4893,17 +5062,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klõpsake <guibutton>Tagasi</guibutton>, kui te ei ole oma valikus kindel."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klõpsake <guibutton>Edasi</guibutton>, kui olete kindel ning soovite "
 "kustutada kõvakettal kõik partitsioonid, kõik operatsioonisüsteemid ja üldse "
@@ -5028,16 +5200,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia eemaldamine"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Õpetus"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult, "
@@ -5045,28 +5213,30 @@ msgstr ""
 "operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi "
 "korral ka endale täielikult selja keerata."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Kui olete oma andmed varundanud, taaskäivitage Mageia DVD ja valige "
 "Päästesüsteem ning seejärel käsk Restore Windows boot loader. Järgmisel "
 "arvuti käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus "
 "operatsioonisüsteemi valida."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis, "
 "valige <code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; "
@@ -5076,8 +5246,8 @@ msgstr ""
 "Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige "
 "<guibutton>Delete</guibutton>. Ruum vabanebki."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5085,14 +5255,15 @@ msgstr ""
 "Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32 "
 "või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat "
 "partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi "
@@ -5146,3 +5317,332 @@ msgstr ""
 "Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti "
 "aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada "
 "lasta."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Parool (uuesti)</guilabel>: siia tuleb kirjutada teist korda "
+#~ "kasutaja parool ning DrakX kontrollib, kas see on ikka sama, mis "
+#~ "kirjutati ülal asuvasse kasti."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr " Samuti saab siin lubada või keelata külaliskonto."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Kõik, mida külaline oma vaikimisi <emphasis>rbash</emphasis> külaliskonto "
+#~ "all /home-kataloogi salvestab, kustutatakse külalise väljalogimisel. "
+#~ "Tähtsad failid peaks külaline salvestama USB-pulgale."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Külaliskonto (guest) lubamine</guilabel>: siin saab lubada või "
+#~ "keelata külaliskonto. See võimaldab külalisel, kellele pole kasutajat "
+#~ "loodud, sisse logida ja arvutit kasutada, kuid tema õigused on tavalise "
+#~ "kasutajaga võrreldes palju piiratumad."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grupi ID</guilabel>: siin saab määrata grupi ID. See on samuti "
+#~ "arv, tavaliselt sama kasutaja ID-ga. Kui te ei tea, milleks see hea on, "
+#~ "ärge siia midagi kirjutage."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Seade\" koosneb järgmistest elementidest: \"kõvaketas\", "
+#~ "[\"kõvakettanumber\"(täht)], \"partitsiooninumber\" (näiteks \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Tööjaam."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Graafiline keskkond."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "choosePackagesTree.png\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Teenustegruppe on neli. Nende ees olevale kolmnurgale klõpsates saab "
+#~ "grupi avada ja uurida selles peituvaid teenuseid."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_card_list.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_card_list-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Kui te ei leia oma kaarti tootjate nimekirjast (sest seda pole veel "
+#~ "andmebaasis või on tegu väga vana kaardiga), võib siiski leida sobiva "
+#~ "draiveri Xorg-i kategoorias."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_chooser.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_chooser-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "There is a tab for every detected hard disk or other storage device, like "
+#~ "an USB key. For example sda, sdb and sdc if there are three of them."
+#~ msgstr ""
+#~ "Igale leitud kõvakettale või muule salvestusseadmele, näiteks USB-"
+#~ "pulgale, on omaette kaart. Need võivad olla näiteks sda, sdb ja sdc, kui "
+#~ "teil juhtub olema kolm salvestusseadet."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Align to\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Sellel ekraanil on võimalik määrata mõned isiklikud eelistused:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Keel (ainult paigaldamiseks, võib erineda süsteemile valitavast keelest) "
+#~ "klahvile F2 vajutades (ainult tavapärases süsteemis)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Siin on näiteks LiveDVD/CD eestikeelne tervitusekraan. Pange tähele, et "
+#~ "LiveDVD/CD menüüs ei ole kirjeid, nagu <guilabel>Päästesüsteem</"
+#~ "guilabel>, <guilabel>Mälu testimine</guilabel> ja <guilabel>Riistvara "
+#~ "tuvastamise tööriist</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis role=\"bold"
+#~ "\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold"
+#~ "\">e</emphasis> UEFI süsteemi korral."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
+#~ "kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale "
+#~ "tekstirea <guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult "
+#~ "tavapärases süsteemis)"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Juhtmega võrgu kasutamine"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
+#~ "(netinstall.iso või netinstall-nonfree.iso tõmmis) kasutamisel:"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud "
+#~ "ekraanil. Rohkem teavet juhtmega võrgu põhise paigaldamise CD kasutamise "
+#~ "kohta leiab <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
+#~ "\">Mageia Wikist</link>."
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Klaviatuuripaigutus on Ameerika-pärane."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection."
+#~ "png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Kui märkida \"X'iga\", paigaldatakse ka kergekaaluline töökeskkond IceWM."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Siin saab kohandada oma arvuti turbetaset."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Kui te ei ole kindel, ärge hakake siin midagi muutma, vaid jätke kehtima "
+#~ "vaikimisi määratu."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva "
+#~ "Mageia süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse "
+#~ "pakutakse. Paigaldamine on lihtsam, aga ka valikuid on vähem."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "CD-d ainult alglaadimiseks"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Märkige raadionupp Salvestama."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Samuti võib kasutada konsoolis tööriista dd:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Eemaldage USB-pulk, kõik on valmis"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Selle valimisel saab ette võtta uue <application>Mageia</application> "
+#~ "paigaldamise."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Kui teie süsteemi on juba varem paigaldatud <application>Mageia</"
+#~ "application>, võimaldab paigaldusprogramm seda uusimale väljalaskele "
+#~ "uuendada."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"setupSCSI-im1\"/> </imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Õpetus"
diff --git a/docs/docs/stable/installer/eu.po b/docs/docs/stable/installer/eu.po
index 63ba0f8b..db8b3343 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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/"
@@ -28,12 +28,13 @@ msgstr "Lizentzia eta Askatze Oharrak"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -66,8 +67,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Onartzeko, hautatu <guilabel>Ados</guilabel> eta egin klik "
@@ -90,9 +92,10 @@ msgstr "Askapen Oharrak"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Informazio garrantzitsua <application>Mageia</application> oharra honi buruz "
@@ -100,13 +103,13 @@ msgstr ""
 "daude eskuragarri."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "eu"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
 
@@ -114,23 +117,25 @@ msgstr "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Pantaila honek dagoeneko aitortutako biltegi zerrenda erakusten du. Pakete "
 "iturri batzuk gehi ditzakezu disko optikoa edo urrutiko iturri gisa. "
@@ -138,23 +143,25 @@ msgstr ""
 "zehazten dute."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Sare iturri batentzat, bi pausu jarraitu beharko ditugu:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Sarea aukeratzea eta aktibatzea, dagoeneko ez baldin badago."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Aukeratu ispilu bat, edo URL bat (lehen sarrera) zehaztu. Noiz ispilu "
 "zerbitzari bat hautatuta mageia biltegi administratze guztien aukeraketa "
@@ -162,14 +169,15 @@ msgstr ""
 "batekin, biltegi-zehatzak edo zure NFS instalazioa izenda dezakezu."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "64 biteko instalazio bat eguneratzen ari bazara 32 biteko pakete batzuk izan "
 "ditzake, pantaila hau erabiltzea gomendatzen da online ispilu bat gehitzeko, "
@@ -185,7 +193,7 @@ msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,21 +206,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ezarri administratzaile (root) pasahitza:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Administratzaile / supererabiltzaile pasahitz bat konfiguratzea "
 "gomendagarria da, Linux-en <emphasis>root pasahitz</emphasis> bezala "
@@ -224,25 +232,28 @@ msgstr ""
 "egiaztatzeko."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Sartu erabiltzaile bat"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Hemen erabiltzaile bat gehi daiteke. Erabiltzaile batek administratzaileak "
 "baino baimen gutxiago ditu, baina nahikoak Interneten nabigatzeko, aplikazio "
@@ -250,7 +261,7 @@ msgstr ""
 "ordenagailuarekin edozer egiteko."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -259,7 +270,7 @@ msgstr ""
 "erabiltzaile ikonoa aldatu egingo da."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -268,10 +279,11 @@ msgstr ""
 "ezazu testu-kutxa honetan."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Saio Hasiera Izena</guilabel>: Erabiltzailearen saio-hasierako "
@@ -280,11 +292,12 @@ msgstr ""
 "minuskulei sentibera da.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Pasahitza</guilabel>: Testu-kutxa honetan erabiltzaile-pasahitza "
 "idatzi behar izango zenuke. Ezkutu bat agertzen da pasahitzaren indarra "
@@ -292,29 +305,30 @@ msgstr ""
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Pasahitza (berriz)</guilabel>: Erabiltzaile-pasahitza berridatziko "
-"duzu kutxa honetan eta drakx-ak begiratuko du testua, erabiltzailearen "
-"pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula."
+"<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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -323,87 +337,59 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Sarbide baimena instalatu ondoren ere aldatu egin daiteke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Erabiltzailearen Kudeaketa Aurreratua"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Botoi <guibutton>aurreratua</guibutton> sakatzen bada konfigurazioa gehitzen "
 "duen erabiltzailearentzat editatzea baimentzen dion pantaila eskaintzen zaio."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"gonbidatu erabiltzaile batek gordetako edozer gauza(<emphasis>rbash</"
-"emphasis>rekin) zure karpeta nagusitik ezabatu egingo da saioa amaitzean. "
-"Gonbidatuak bere fitxategi garrantzitsuak USB disko baten gorde behar ditu."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Gaitu gonbidatu kontua </guilabel>: Hemen gonbidatu kontu bat "
-"gaitu edo desgaitu dezakezu. Gonbidatu kontua gonbidatu bati PC-an sartu eta "
-"erabiltzeko aukera ematen du, baina erabiltzaile sarrera normala baino "
-"murritzagoak izaten dira."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: 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:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>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:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Talde ID</guilabel>: Honek uzten zaitu talde ID sorta, zenbaki "
-"bat, normalean erabiltzaileari dagokion berdina. Hutsik utzi ezazu ez "
-"badakizu zer egiten ari zaren."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Aukeratu muntatze-puntuak"
 
@@ -420,13 +406,14 @@ msgstr "Aukeratu muntatze-puntuak"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -436,7 +423,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -447,41 +434,45 @@ msgstr ""
 "puntu alda ditzake."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Edozer aldatzen baduzu, ziurtatu oraindik <literal>/</literal> (root) "
 "partizioa duzual."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Partizio bakoitza honela erakutsiko da: \"Gailua\" (\"Tamaina\", \"Muntatze "
 "puntua\", \"Mota\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Gailua\", honako hauek osatzen dute: \"disko\", [\"Disko gogor zenbakia"
-"\" (letra)], \"partizio-zenbakia\" (adibidez, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Partizio batzuk badituzu, muntai puntu ezberdinak aukera ditzakezu zerrenda "
 "zabaltzen, <literal>/</literal>, <literal>/home</literal> eta <literal>/var</"
@@ -491,27 +482,29 @@ msgstr ""
 "instalazioko home partiziorako."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Zuk sartu behar ez duzun partizioen, muntaketa puntuaren eremua hutsik utzi "
 "dezakezu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "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:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -780,8 +773,9 @@ 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 "
+"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 "
@@ -789,8 +783,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -809,14 +804,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Nahiago duzun idazmahaiko ingurunea, <application>KDE</application> edo "
 "<application>Gnome</application> aukera itzazu. Biek aplikazio erabilgarri "
@@ -843,8 +840,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -856,62 +854,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Lanpostua."
+#, 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
-msgid "Server."
-msgstr "Zerbitzaria."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Ingurumen Grafikoa."
+#, 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
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Banakako Pakete Hautaketa: Aukera hau erabili ahal izango duzu eskuz gehitu "
 "edo kentzeko paketeak."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Irakur <xref linkend=\"minimal-install\"/> instalazio minimo bat egiteko "
 "argibideak (X &amp; IceWM -ekin edo gabe)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Aukeratu Banakako Paketeak"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Hemen edozein extra pakete gehitu edo kendu dezakezu zure instalazioa "
 "pertsonalizatzeko."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -925,47 +930,45 @@ msgstr ""
 "berak instalatzeko, kargatzeko instalazioan zehar botoi bera sakatuz."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfiguratu zure Zerbitzuak"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Hona hemen zein zerbitzu (ez) duten hasi behar zure sistema abiarazterakoan "
 "ezar dezakezu."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Badira lau talde, sakatu talde bateko aurreko triangeluan zabaltzeko eta "
-"zerbitzuak ikusteko."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Aukeratutako DrakX ezarpenak onak izaten dira."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -974,7 +977,7 @@ msgstr ""
 "koadroan erakusten da."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
 
@@ -987,12 +990,13 @@ msgstr "Konfiguratu zure Denbora-Eremua"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1002,18 +1006,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Hurrengo pantailan zure hardware erlojua tokiko ordu edo GMT, UTC gisa "
 "ezagutzen dena ezartzeko aukera daukazu."
@@ -1028,23 +1034,23 @@ msgstr ""
 "bertako orduan ezarrita dutela, edota UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Aukeratu X zerbitzari bat (Konfiguratu Txartel Grafikoa)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1053,7 +1059,7 @@ msgstr ""
 "behar bezala identifikatuko du."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1062,37 +1068,30 @@ msgstr ""
 "duzun baldin badakizu, hautatu ahal izango duzu zuhaitzean:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "hornitzailea"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "ondoren zure txartela izena"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "eta txartel mota"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Zure txartela ezin baduzu fabrikatzaile zerrendan aurkitu (oraindik datu-"
-"basean ez delako sartu edo txartela zaharra delako) kontrolatzaile egokia "
-"aurki dezakezu Xorg-en kategorian."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg-eko zerrendak generiko eta kode irekiko 40 kontrolatzaile baino gehiago "
 "hornitzen ditu bideo-txartelerako. Oraindik zure txartelerako kontrolatzaile "
@@ -1101,63 +1100,67 @@ msgstr ""
 "du."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Kontutan izan bateraezina kontrolatzaile bat hautatzen baduzu Aginte "
 "Interfazerako sarbidea soilik izan dezakezula."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "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:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree 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:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Zuk Mageia-ren instalazio honetarako aukeratu duzun ingurune grafikoarekiko "
 "(idazmahai-ingurune bezala ere ezagututa) independenteki, guztiak "
@@ -1170,7 +1173,7 @@ msgstr ""
 "egoki aukeratu ikusten baduzu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1179,13 +1182,14 @@ msgstr ""
 "txartela zerrendatik behar izanez gero."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Pantaila</guibutton></emphasis>: Aukera dezakezu "
 "<guilabel>Plug'n Play</guilabel> posible denean, edo <guilabel>Hornitzaile</"
@@ -1194,30 +1198,31 @@ msgstr ""
 "freskatze horizontaleko eta bertikaleko tasak eskuz jartzea nahiago baduzu."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Freskatze tasa okerra zure pantaila kaltetu dezake"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Bereizmena</guibutton></emphasis>: Hemen pantailan "
 "ezarri nahi den ebazpen eta kolore sakonera."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Froga</guibutton></emphasis>: Froga botoia ez da beti "
 "agertzen instalazioan zehar. Botoia baldin badago, bere ezarpenak kontrola "
@@ -1228,7 +1233,7 @@ msgstr ""
 "seguruan dagoela froga botoia eskuragarri ez badago</emphasis>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1237,12 +1242,12 @@ msgstr ""
 "aktibatzeko edo desaktibatzeko aukera dezakezu."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Aukeratu zure Pantaila"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1251,12 +1256,13 @@ msgstr ""
 "identifika dezake."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Pantaila ezaugarri ezberdinak dituen bat aukeratzea zure pantaila "
 "edo bideo osagaiak kaltetu dezakete. Mesedez, ez zaitez saiatu ezer egiten "
@@ -1264,23 +1270,23 @@ msgstr ""
 "zure pantailaren dokumentazioa."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Pertsonalizatua</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1293,7 +1299,7 @@ msgstr ""
 "horizontal tasa zein lerro ikus daitezke."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1306,12 +1312,12 @@ msgstr ""
 "ikusi zure pantailaren dokumentazioa."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1320,12 +1326,12 @@ msgstr ""
 "saiatzen da."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Hornitzailea</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1334,28 +1340,30 @@ msgstr ""
 "baldin badakizu, hautatu ahal izango duzu hautaketa zuhaitzean:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "pantailaren fabrikatzailearen izena"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "pantailaren deskribapena"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generikoa</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "hautatu 30 talde inguruko pantaila ezarpenak 1024x768 @ 60Hz pantaila lauak "
 "eta eramangarriak bezalakoak erabiltzen dira. Hau da, askotan pantaila "
@@ -1364,12 +1372,12 @@ msgstr ""
 "kontserbadorea izan behar da."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1380,12 +1388,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Zure <literal>/</literal> partizioa enkriptatu nahi baduzu, bereiztutako  "
 "<literal>/boot</literal> partizio bat duzula ziurtatu behar duzu. <literal>/"
@@ -1393,43 +1403,44 @@ msgstr ""
 "sistema ez izango da abiarazi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"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:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Sakatu <guibutton>Garbitu guztia</guibutton> aukeratutako biltegi gailu "
 "partizio guztiak garbitzeko"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Beste ekintza guztiak: sakatu nahi den partizioa lehenik. Gero ikusi, edo "
 "aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo "
@@ -1438,32 +1449,34 @@ msgstr ""
 "bezalako tresna gehiago batzuk ematen ditu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Jarraitu dena zure nahiei egokitu arte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik <guibutton>Eginda</guibutton> prest zaudenean."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1471,12 +1484,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1485,7 +1498,7 @@ msgstr ""
 "partizioa dagoela eta mota zuzena duela"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1498,32 +1511,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partizioa egiten"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "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:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Beheko zerrendatik erabilgarri dauden aukerak bereziki aldatuko dira zure "
 "disko gogor(rren) diseinu eta edukien arabera."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1536,12 +1551,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Lehendik dauden Partizioak"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1550,12 +1565,12 @@ msgstr ""
 "egin dira eta instalazioa erabili ahal izango du."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Erabili Espazio Hutsa"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1564,12 +1579,12 @@ msgstr ""
 "erabiliko da zure Mageia instalazio berriarentzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Erabili Espazio Librea Windows-en Partizioan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1578,7 +1593,7 @@ msgstr ""
 "instalatzaileak, erabili ahal izateko eskainiko dizu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1589,7 +1604,7 @@ msgstr ""
 "garrantzitsuen babeskopia egin behar duzu!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1606,12 +1621,14 @@ msgstr ""
 "gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Aukera honekin instalatzailea gainerako Windows-en partizioa  urdin argiz "
 "eta etorkizuneko Mageia partizioa urdin ilunez euren xede tamainekin "
@@ -1619,37 +1636,39 @@ msgstr ""
 "partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Ezabatu eta erabili disko osoa."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Aukera honek disko osoa erabiliko du Mageia-rantzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz "
 "ibili!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1659,12 +1678,12 @@ msgstr ""
 "informazioa baduzu,, ez ezazu aukera hau erabili."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Disko-partizio pertsonalizatua"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1673,70 +1692,83 @@ msgstr ""
 "gogorrean."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Instalatzaileak eskuragarri dauden leku partekatuko ditu honako arauen "
-"arabera:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "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:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "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:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 erabateko espazio libretik /-ra esleitzen da 50 GB-ko gehiengoarekin"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 4 GB gehienez trukatzeko esleitzen da"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "gainerakoa (gutxienez 12/19) da / home-ra esleitzen da"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "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:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "UEFI sistema bat erabiltzen ari bazara, ESP (EFI sistema partizioa) "
 "automatikoki detektatu egingo da, edo sortu ez bada existitzen oraindik, "
@@ -1744,17 +1776,17 @@ msgstr ""
 "arrakastaz bete dela frogatzen du."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1765,7 +1797,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1774,15 +1806,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Zenbait disko gogor berri 4096-byteko sektore logikoak erabilitzen dituzte, "
 "512 byte estandarraren ordez. Hardware librerik ezagatik partizio tresna ez "
@@ -1792,19 +1825,22 @@ msgstr ""
 "gero, eta hurrengo konfigurazioak erabil ditzala:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"lerrokatu\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Aurreko espazio librea (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
 
 #. type: Content of: <article><info><title>
@@ -1813,7 +1849,7 @@ msgid "Installation from LIVE medium"
 msgstr "LIVE euskarriko instalazioa"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1828,18 +1864,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia-ren dokumentazio Ofiziala"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1851,7 +1887,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1863,7 +1899,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1875,13 +1911,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1893,26 +1929,34 @@ msgstr ""
 "araberakoa izango da."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "DrakX-rekin Instalazioa"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "2014ko Otsaila"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1920,7 +1964,7 @@ msgstr "Zorionak"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1929,7 +1973,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1940,16 +1984,17 @@ msgstr ""
 "berrabiaraztea."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Berrezarri ondoren, abioko kargatzailea, zure ordenagailuko sistema "
 "eragileen artean aukera dezakezu (bat baino gehiago izanez gero)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1958,12 +2003,12 @@ msgstr ""
 "automatikoki hautatu eta hasiko da."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Gozatu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1978,11 +2023,12 @@ msgstr "Suhesia"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Atal honek suhesi arau sinple batzuk konfiguratzeko aukera ematen du: "
 "helburuko sistemak interneten bidez zein motatako mezuak onartuko diren "
@@ -1992,22 +2038,23 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Gainontzeko checkbutton guztiak gutxi gorabehera azaleratzen dira. Adibidez, "
 "\"CUPS zerbitzaria\" botoia egiaztatuko duzu zure makinako inprimagailuak "
@@ -2021,20 +2068,18 @@ msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2042,14 +2087,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2058,7 +2103,7 @@ msgstr ""
 "emphasis> da."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2067,7 +2112,7 @@ msgstr ""
 "zehazten dira portu bererako."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formateatzen"
 
@@ -2076,14 +2121,14 @@ msgstr "Formateatzen"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2093,23 +2138,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Hemen aukera dezakezu zer partizio formateatu nahi. <emphasis>Ez</emphasis> "
 "formateatzeko markatutako partizioetako edozein datu gordeko dira."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Normalean gutxienez DrakX hautatutaako partizioak, formateatu behar izaten "
 "dira"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2118,12 +2164,13 @@ msgstr ""
 "<emphasis>Bloke okerrak</emphasis> egiaztatzeko."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Ez bazaude ziur aukeraketa egokia egin duzula,  <guibutton>Atzera</"
 "guibutton>, eta berriro <guibutton>Atzera</guibutton> eta gero "
@@ -2131,7 +2178,7 @@ msgstr ""
 "pantailara itzultzeko. Pantaila honetan zure partizioek dutena ikus dezakzu."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2140,12 +2187,12 @@ msgstr ""
 "klikatu jarraitzeko."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Instalatzilea"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2156,7 +2203,7 @@ msgstr ""
 "bezain erraz egiten laguntzeko."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2165,151 +2212,148 @@ msgstr ""
 "da, normalean, behar duzun guztia dela."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Instalazio Ongi etorri Pantaila"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Mageia DVDa erabiliz"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "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:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "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:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Pantaila honetatik, posiblea da hobespen pertsonal batzuk ezartzea:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Hizkuntza (instalaziorako soilik, sisteman aukeratutako hizkuntzaren "
-"desberdinak izan daitezke) F2 gakoa sakatuz (Ondare moduan soilik)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Erabili geziak hizkuntza aukeratzeko eta sakatu Sartu."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Hemen adibide bat dago, CD/DVD Live mota erabiltzean agertutako Frantsesezko "
-"ongietorri pantaila. Nabaritu aipaturiko CD/DVDaren menuak ez duela "
-"proposatzen: <guilabel>Berreskuratze Sistema</guilabel>, "
-"<guilabel>Memoriaren Frogapena</guilabel> ezta <guilabel>Hardwarea "
-"antzemateko tresnarik</guilabel> ere."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "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><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Gehitu kernel aukera batzuk <emphasis role=\"bold\">F6</emphasis> ondare "
-"moduan edo <emphasis role=\"bold\">e</emphasis> sakatuz  UEFI modurako."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Berez, ez du lehenetsitako aukeretan ezer aldatzen."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Instalazioak huts egiten badu, orduan berriro beste aukera osagarri "
-"batzuekin saiatzea beharrezkoa izan daiteke. F6 sakatzen duzunean agertzen "
-"den menuak lerro <guilabel>Abio aukarak</guilabel> berri bat erakusten du "
-"eta lau aukera proposatzen ditu:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Berez, ez du lehenetsitako aukeretan ezer aldatzen."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- ACPI-rik gabe (Advanced Configuration and Power Interface), energia-"
 "administrazioa ez da kontuan hartzen."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- 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:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2318,53 +2362,52 @@ msgstr ""
 "erakutsitako jatorrizko aukerak aldatzen dira."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Maegia bertsio batzuetan, hautatutako F6 gakoarekin hautatutako aukerak ez "
 "direla <guilabel>Abio aukerak</guilabel> lerroan agertzen gerta daiteke. "
 "Hala ere, kontuan izango dira."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr "Gehitu kernel aukera gehiago F1 tekla (Ondare moduan soilik) sakatuz."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "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."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Aukeren pantailaren ikuspegi zehatza. Sakatu Esc edo hautatu "
 "<guilabel>Abioko aukeretara Itzultzea</guilabel> aukeren zerrendara "
@@ -2372,19 +2415,22 @@ msgstr ""
 "guilabel> lerroan."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2395,81 +2441,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Kabledun sarea erabiltzen"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Hona hemen hasierako pantaila kable sare instalazioan oinarritzen CD bat "
-"erabiltzen denean (netinstall.iso edo netinstall-nonfree.iso imajinak)"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Ezin duzu hizkuntza aldatu, aukerak pantailan azaltzen dira. Haridun Sarean "
-"oinarritutako instalazio CDa  nola erabiltzeari buruzko informazio gehiago "
-"lortzeko, bisitatu <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">Mageiaren Wiki-a</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Teklatuaren diseinua amerikarra da."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Instalazio urratsak"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Instalazio prozesuko hainbat urrats pantailaren alboko panelean jarraitu "
 "daitezke."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "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:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Pantailak gehienek <guibutton>Laguntza</guibutton> botoiak dituzte, zienek "
 "pausuei buruzko azalpenak emango dizute."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2486,17 +2499,17 @@ msgstr ""
 "Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instalazio arazoak eta Konponbide Posibleak"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Interfaze Grafikorik gabe"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2508,13 +2521,16 @@ msgstr ""
 "terminalean idatziz."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Hardwarea zaharra bada, Beharbada ez da posible instalazio grafikoa egitea. "
 "Aipaturiko kasuan, testu modu instalazio bat saia liteke. Aipaturiko modua "
@@ -2524,12 +2540,12 @@ msgstr ""
 "instalazioarekin jarrai ezazu."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instalatu Osagaiak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2544,14 +2560,15 @@ msgstr ""
 "beste batzuekin konbina daiteke."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM arazoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2563,18 +2580,20 @@ msgstr ""
 "lituzke."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Partizio dinamikoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Zuk \"oinarrizko\" formatutik zure disko gogorra \"dinamiko\"-ra bihurtu "
 "bazenuen Microsoft Windows-en, Mageia disko honetan jartzea ezinezkoa izango "
@@ -2593,18 +2612,18 @@ msgstr "Eguneraketak"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2613,10 +2632,11 @@ msgstr ""
 "batzuk eguneratu edo hobetu dira."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "<guilabel>Bai</guilabel> aukeratu instalatu nahi baduzu, <guilabel>Ez</"
@@ -2624,8 +2644,9 @@ msgstr ""
 "ez bazaude"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko"
 
 #. type: Content of: <section><info><title>
@@ -2683,18 +2704,18 @@ msgstr "Baliabide Aukeraketa (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2706,7 +2727,7 @@ msgstr ""
 "aukeraketa hurrengo urratsetan hautagai izagon diren paketeak zehaztuko ditu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2715,7 +2736,7 @@ msgstr ""
 "oinarria daukanez gero."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2730,13 +2751,14 @@ msgstr ""
 "ditu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "<emphasis>Tainted</emphasis> biltegiak barne hartzen ditu doako "
 "lizentziapean argitaratutako paketeak. Paketeak biltegi honetan jartzeko "
@@ -2746,37 +2768,40 @@ msgstr ""
 "paketeak, etab."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalazio Minimoa"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Instalazio txikiena aukeratu dezakezu pakete taldeen pantailan dena "
 "desautatuz, ikus <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Nahi izanez gero, halaber \"banakako pakete aukeraketa\" egiaztatu dezakezu "
 "pantaila berean."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "<application>Mageiaren</application> erabilera espezifikoak buruan "
 "dutenentzat dago zuzenduta instalazio minimoa, zerbitzari edo lanpostu "
@@ -2785,23 +2810,24 @@ msgstr ""
 "fintzeko, ikus <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "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:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
-msgstr "\"X-ekin\" hautatzen bada, IceWM idazmahai arin gisa egongo da."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2816,15 +2842,15 @@ msgstr ""
 "ditu."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2841,11 +2867,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX adimentasunez hautatzen ditu ezarpenak zure sistemaren detektatutako "
 "hardwarearen arabera. Ezarpenak egiaztatu ahal izango dituzu hemen eta "
@@ -2853,9 +2880,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Arau orokor gisa, ezarpen lehenetsiak gomendatzen dira eta 3 salbuespen "
 "gorde ditzakezu:"
@@ -2872,71 +2900,75 @@ msgstr "Dagoeneko ezarpen lehenetsia probatu dae eta porrot egin du"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "Beste zerbait esaten da beheko atal zehatzetan"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Sistema parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Denbora-Eremua</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX ordu eremua hautatutako hizkuntzaren arabera aukeratzen du. Aldatu "
 "nahi baduzu, behar izanez gero, Ikusi ere <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Herrialde/Eskualde</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Aukeratutako herrian ez bazaude, zuk hura zuzentzea garrantzitsua da.  Ikus "
 "<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Abio kargatzailea</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX aukera onak egin ditu abio kargatzailearen ezarpenekin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Ezer ez aldatu, Grub2 konfiguratzeaz jakin ezean"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Informazio gehiagorako, ikus <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Erabiltzaile kudeaketa</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2945,22 +2977,23 @@ msgstr ""
 "literal> direktorioa izango du."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Zerbitzuak</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Sistema Zerbitzuak atzeko aldean abian dauden programa txikiak aipatzeko "
 "(deabru) bezala ezagutzen da. Tresna honek horietako batzuk gaitu edo "
 "desgaitzeko aukera ematen dizu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2969,31 +3002,32 @@ msgstr ""
 "ordenagailuak gaizki funtzionatzea eragin dezake."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "For more information, see <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Hardware parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teklatua</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Hemen da non teklatuaren antolamendua ezarri edo aldatu ditzakezun  zure "
 "kokapen, hizkuntza edo teklatu motaren arabera."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3002,12 +3036,12 @@ msgstr ""
 "kontuan izan zure pasahitzak ere aldatu egingo direla."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Sagua</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3016,40 +3050,41 @@ msgstr ""
 "trackballs, etab "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Soinu txartela</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "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:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaze grafikoa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Atal honen bitartez, zure txartel grafikoa(k) eta pantaila konfigura "
 "dezakezu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Informazio gehiagorako, ikus <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3058,20 +3093,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Sare eta Internet parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sarea</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3080,21 +3116,22 @@ msgstr ""
 "Kontrol Gunean</application>, non-free biltegiak gaituta eduki ondoren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Sare txartel bat gehitzen duzunean, ez ahaztu zure suebakia interfazena "
 "ezartzen, ikusteko ere."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxiak</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3105,26 +3142,27 @@ msgstr ""
 "ordenagailuak erabiltzeko ezarpenak jartzeko baimentzen dizu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Zure sistema administratzaileari kontsultatu beharko diozu eskuratzeko hemen "
 "sartu beharreko parametroak"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Segurtasuna"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Segurtasun Maila</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3134,17 +3172,17 @@ msgstr ""
 "orokorrerako."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Begiratu zure erabilerara hoberen egokitzen den aukera."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Suebakia</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3154,7 +3192,7 @@ msgstr ""
 "arriskuan jarri dezaketenen artean hesi bat jartzea da."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3165,7 +3203,7 @@ msgstr ""
 "gehiago lortzeko, ikus<xref linkend=\"firewall\"/> ."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Kontuan izan dena ahalbidetzea (suebaki gabe) oso arriskutsua izan "
@@ -3235,39 +3273,73 @@ msgstr ""
 "<application>Mageia</application> instalatzeko tokia egiteko."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioaren tamaina:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Zure segurtasun maila egokitu dezakezu hemen."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Aurreratua</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Zuk zer aukeratu ez badakizu, lehenetsitako konfigurazioa utz ezazu."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Instalatu ondoren, beti posible da <guilabel>Segurtasuna</guilabel> Mageia "
 "Kontrol Gunean segurtasun ezarpenak aldatzea."
@@ -3284,25 +3356,27 @@ msgstr "Sarrera"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia ISO irudi bidez banatzen da. Orri honek, irudia zure beharren arabera "
 "aukeratzen lagunduko dizu."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Bi media famili daude:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Instalatzaile Klasikoa: baliabidea abiarazi ondoren, aukera baimentzen duen "
 "prozesua jarraituko duela zer jarri eta sistema nola itxuratu.. Honek emango "
@@ -3310,84 +3384,88 @@ msgstr ""
 "Idazmahaiko Ingurunea aukeratzeko."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE media: benetako Mageia sistema bat abiarazi dezakezu instalatu gabe, "
-"instalazioa egin ondoren zer egin ikusteko. Instalazio prozesua errazagoa "
-"da, baina aukera txikiagoak lortuko dituzu."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Xehetasunak ematen dira hurrengo ataletan."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Baliabidea"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definizioa"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "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:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Aurki ditzakezu <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">hemen</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Instalazioa Klasiko baliabidea"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Ezaugarri komunak"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 "ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Eskuragarri dago instalazio garbi bat egitea edo berritzea aurreko bertsio "
 "batetatik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "32 edo 64 biteko arkitektura media ezberdinak."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3396,111 +3474,116 @@ msgstr ""
 "Sistema, Memoria Testa, Hardware hautemate tresna."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "Instalazioan zehar software ez librea gehitzeko aukera izango duzue."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live baliabidea"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "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:80
+#: 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)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live ISOak instalazio garbiak sortzeko soilik "
 "erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko erabili.</"
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Software ez librea dute."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Plasma Live DVDa"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Plasma mahaigain ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Hizkuntza guztiak presente daude."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "64 bit arkitektura soilik."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "GNOME-ren Live DVD-a"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "GNOME mahaigaineko ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Xfce Live DVDa"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Xfce mahaigain ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 edo 64 bit arkitektura"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Abioko CD baliabidea soilik"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3512,28 +3595,30 @@ msgstr ""
 "Interneten."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Ingelera hizkuntza soilik"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3567,11 +3652,12 @@ msgstr "Deskargatzen"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Behin zuk zure ISO fitxategia aukeratuta, deskargatu dezakezu http edo "
 "BitTorrent-a erabiliz. Bi kasuetan, leiho batek informazioren bat ematen "
@@ -3586,10 +3672,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum eta sha1sum ISOaren osotasuna egiaztatzeko tresnak dira. Erabili "
 "horietako bat bakarrik. Gorde bat <link linkend=\"integrity\">geroago "
@@ -3602,8 +3689,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Egiaztatu Fitxategia Gorde botoia."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3611,14 +3698,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Deskargatutako baliabide osotasunaren egiaztapena"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Checksum zenbaki biak deskargaturiko fitxategitik algoritmo batek "
 "kalkulatzen hamaseitarrak dira. Algoritmo hauei eskatzen diezunean zenbaki "
@@ -3628,69 +3716,84 @@ msgstr ""
 "izango zenukeela edo konponketa bat egin BitTorrent erabiliz. "
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Ireki kontsola bat, ez da root izan beharrik, eta:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- md5sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- sha1sum erabiltzeko, idatzi: [sam@localhost]$ <userinput>sha1sum path/to/"
 "the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"eta lortutako zenbakia zure ordenagailuan konparatu mageia emandako "
-"zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"eta lortutako zenbakia zure ordenagailuan konparatu mageia emandako "
+"zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Grabatu edo irauli ISOa"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "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:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISOa CD/DVDan grabatzen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Erabil ezazu nahiago duzun edozein erregailua baina ziurta ezazu grabatzeko "
 "gailuak ondo dagoela <emphasis role=\"bold\">irudi bat grabatzeko</"
@@ -3699,12 +3802,12 @@ msgstr ""
 "\">Mageia wikia</link>n."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Irauli ISOa USB baten"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3714,18 +3817,19 @@ msgstr ""
 "instalatzeko."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3734,12 +3838,12 @@ msgstr ""
 "duzu USB makila."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 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:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3749,72 +3853,71 @@ msgstr ""
 "tresna grafiko bat erabil dezakezu"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 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:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Zu saiatuko zinateke:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> \"ISO "
 "irudia\" aukera erabiliz;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Komando lerroa erabiliz GNU/Linux sistema barnean"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "potentzialki *arriskutsua* da hau eskuz egitea. Disko partizioa gainidatziz "
 "okerreko identifikatzailea lortzeko arriskua dago."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "dd kontsola tresna bezala ere erabil dezakezu:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Kontsola bat ireki"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3823,28 +3926,40 @@ msgstr ""
 "fitxategi kudeatzaile ez ireki  hori eskuratu eta irakurri, ezin)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Idatzi <userinput>fdisk-l</userinput> komandoa"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"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
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "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><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3886,46 +4001,55 @@ 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:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Aurkitu zure USB gailuaren izena (bere tamainaren arabera), adibidez <code>/"
-"dev/sdb</code> goiko irudian, 8GB USB-makila."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Non X=zure dispositiboaren izena adibidez: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Agindua sartu: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Deskonektatu zure USB, eginda dago"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3955,19 +4079,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Zure herrialdea <guilabel>Beste Herrialde</guilabel> zerrendan soilik "
@@ -3976,18 +4102,19 @@ msgstr ""
 "zure benetako aukera jarraituko du."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Sarrera metodoa"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "<guilabel>Beste herrialde</guilabel> pantailan metodoa aukera dezakezu "
@@ -4002,67 +4129,67 @@ msgstr ""
 "daitezke."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "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:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalatu edo Berritu"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalatu"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Aukera hau erabili ezazu <application>Mageia</application> instalazio fresko "
-"baterako."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Berritu"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"<application>Mageia</application> bertsio bat edo gehiago instalaturik "
-"baduzu zure siteman, instalatzaileak haietako bat azken bertiora eguneratzea "
-"utziko dizu."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Gaurkotzearen testatzea soilik egin da oraindik instalatzailearen bertsio "
 "hau bota <emphasis>zenean jasanda zegoen</emphasis> Mageia-ko aurreko "
@@ -4071,16 +4198,17 @@ msgstr ""
 "garbia egitea hobea da."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Instalazioan zehar instalazioa gelditzea erabakitzen baduzu, berrastea "
 "posiblea da, baina bi aldiz pentsa ezazu. Behin partizio bat formateatu "
@@ -4091,12 +4219,14 @@ msgstr ""
 "Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Zuk konturatu bazara hizkuntza gehigarri bat aukeratzea ahaztu duzula, "
 "\"Instalatu edo Eguneratu\" pantailatik itzuli zaitezke hizkuntza aukeretara "
@@ -4131,12 +4261,12 @@ msgstr ""
 "arabera hautatzen da."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Teklatua"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4145,16 +4275,17 @@ msgstr ""
 "ez bada aurkitzen, Amerikar teklatua aukeratuko da."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4171,22 +4302,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:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "<guibutton>Gehiago</guibutton> Leihotik teklatu bat hautatu ondoren, "
 "instalatzailea lehenengo teklatu hautapen leihora itzuliko da, eta "
@@ -4195,23 +4328,24 @@ msgstr ""
 "osotik aukeratutakoa da."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Ez-Latin karakteretan oinarritutako teklatua hautatzen baduzu, pantaila "
 "gehigarri bat agertuko da eskatuz nola nahiago duzu Latin eta Latin ez diren "
 "xedapen artean aldatzeko."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Aukeratu erabiltzeko hizkuntza bat"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4222,19 +4356,20 @@ msgstr ""
 "zehar eta instalatutako sisteman."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Zuretzat edo beste erabiltzaile batzuentzat hainbat hizkuntza instalaturik "
 "behar izanez gero <guibutton>Hizkuntza anitzeko</guibutton> botoia erabili "
@@ -4242,7 +4377,7 @@ msgstr ""
 "izan daiteke."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4255,18 +4390,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "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:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4275,23 +4411,24 @@ msgstr ""
 "komeni da, zure teklatuaren hizkuntza instalatzea."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia UTF-8 (Unicode) laguntza erabiltzen du lehenespenez."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "\"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:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4346,69 +4483,74 @@ msgstr ""
 "konfiguratzen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Gegitu edo Aldatu Abio Menuko Sarrera"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Horretarako, editatu /boot/grub2/custom.cfg eskuz edo erabili grub-"
 "customizer softwarea (eskuragarri Mageia biltegietan)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "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/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Abioko kargatzailearen interfazea"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Lehenespenez, Mageia-k soilik darabil:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (enu grafikoarekin edo gabe) Legacy/MBR edo Legacy/GPT sistemarako"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi UEFI sistementzat."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: 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:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 Legacy/MBR eta Legacy/GPT sistemetan"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4421,27 +4563,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi UEFI sistemetan"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "UEFI 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:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4454,14 +4601,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Mageia zure ordenagailuan instalatutako sistema bakarra bada, "
@@ -4473,40 +4621,43 @@ msgstr ""
 "da eta aski dituzun sistema eragileetako kopurua edozein izanik ere."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Mageia abio kargatzailea erabiliz"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Lehenespenez, zure sistemaren arabera, Mageia-k berri bat idazten du:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 abiarazlea MBR (Master Boot Record) zure lehen disko gogorrean edo "
 "BIOSen abioko partizioan."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4519,18 +4670,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura "
 "zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio "
@@ -4538,20 +4690,20 @@ msgstr ""
 "sistema eragilearen dokumentazioa."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Katearen karga erabiltzen"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4564,14 +4716,14 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4580,104 +4732,102 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Aukerak"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Lehen orria"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Pasahitza</guilabel>: Testu-koadro honetan benetako pasahitza "
 "jartzen  da"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Pasahitza (berriz)</guilabel>: Idatzi berriro pasahitza eta DrakX "
 "lehen ezarritakoarekin bat etortzea egiaztatuko du."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Aurreratu</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP 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:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Hurrengo orria"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Lehenetsia:</guilabel> Sistema eragilea modu lehenetsian hasi da"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4686,22 +4836,22 @@ msgstr ""
 "edo kernelak informazio gehiago emateko esaten dio abioan."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4710,7 +4860,7 @@ msgstr ""
 "linkend=\"setupChainLoading\">Katearen karga erabiliz</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI konfiguratu"
 
@@ -4723,36 +4873,39 @@ msgstr "SCSI konfiguratu"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX normalean zuzentasunez atzematen ditu disko gogorrak. SCSI "
 "kontrolagailu zahar batzuekin ezin izango du gidari zuzenak erabiltzeko "
 "detektatu eta huts egin dezake disko gogorra aitortu nahian."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Horrela bada, eskuz kontatu behar izango dituzu DrakX-ekin dituzun SCSI "
 "disko(ak)."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "Orduan DrakX kontrolatzile zuzena konfiguratzeko gai izan beharko litzateke."
@@ -4774,10 +4927,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Pantaila honetan zure soinu txarteleko gidari Instalatzailearen izena ematen "
 "da, eta hau kontrolatzaile lehenetsia izango da lehenetsitako bat baduzu."
@@ -4799,26 +4952,30 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "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:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Aurreratua"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Klik egin <guibutton>Aurreratua</guibutton> pantaila honetan, instalazioan "
 "zehar, oso erabilgarria da han gidari lehenetsia ez bada, eta hainbat gidari "
@@ -4826,16 +4983,17 @@ msgstr ""
 "duela uste baduzu."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "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:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 
@@ -4846,13 +5004,13 @@ msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4862,16 +5020,19 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr "Klik <guibutton>Aurreko</guibutton> ziur ez bazaude zure aukeraz."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klik <guibutton>Hurrengoa</guibutton> ziur bazaude eta partizio guztiak, "
 "sistema eragilea eta disko gogor horretako datu guztiak ezabatu nahi "
@@ -4996,44 +5157,42 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia desinstalatzen"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Jarraibideak"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Mageia konbentzituko ez balizu edo ezin baduzu behar bezala instalatu, azken "
 "finean kendu nahi baduzu. Hori zure eskubidea da eta Mageiak ere aukera "
 "ematen dizu ezabatzeko. Hau ez da egia sistema eragile guztietan."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Datuen babeskopiaren ondoren, berrabiatu zure Mageia DVD instalazioa eta "
 "hautatu Erreskate sistema, orduan, Leheneratu Windows abioko kargatzailea. "
 "Hurrengo abioan, zuk soilik Windows aukerarik gabe izango duzu zure sistema "
 "eragilea aukeratzeko."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Windows-en Mageiak erabilitako partizio espazioa berreskuratzeko, sakatu "
 "<code>Hasi -> Kontrol-panela -> Administrazio-tresnak -> Ordenagailu "
@@ -5043,8 +5202,8 @@ msgstr ""
 "lekuaren arabera. Eskuinez klikatu partizio horietako bakoitzaren gainean "
 "eta hautatu <guibutton>Ezabatu</guibutton>. Espazioa libratuko da."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5052,14 +5211,15 @@ 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><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Vista edo 7 badaukazu, aukera bat gehiago duzu, liberatutako espazioaren "
 "ezkerretara dagoen partizio existentea heda dezake. Beste partizio tresnak "
@@ -5112,3 +5272,335 @@ msgstr ""
 "Hurrengo pausoa disko gogorrean fitxategiak kopiatzea da. Honek minutu "
 "batzuk hartzen ditu. Bukaeran, pantaila huts bat daukazu aldi baterako, "
 "normala da."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Pasahitza (berriz)</guilabel>: Erabiltzaile-pasahitza "
+#~ "berridatziko duzu kutxa honetan eta drakx-ak begiratuko du testua, "
+#~ "erabiltzailearen pasahitzeko testuko kutxetako bakoitzean pasahitz bera "
+#~ "duzula."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr ""
+#~ "Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "gonbidatu erabiltzaile batek gordetako edozer gauza(<emphasis>rbash</"
+#~ "emphasis>rekin) zure karpeta nagusitik ezabatu egingo da saioa amaitzean. "
+#~ "Gonbidatuak bere fitxategi garrantzitsuak USB disko baten gorde behar "
+#~ "ditu."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Gaitu gonbidatu kontua </guilabel>: Hemen gonbidatu kontu bat "
+#~ "gaitu edo desgaitu dezakezu. Gonbidatu kontua gonbidatu bati PC-an sartu "
+#~ "eta erabiltzeko aukera ematen du, baina erabiltzaile sarrera normala "
+#~ "baino murritzagoak izaten dira."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Talde ID</guilabel>: Honek uzten zaitu talde ID sorta, zenbaki "
+#~ "bat, normalean erabiltzaileari dagokion berdina. Hutsik utzi ezazu ez "
+#~ "badakizu zer egiten ari zaren."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Gailua\", honako hauek osatzen dute: \"disko\", [\"Disko gogor zenbakia"
+#~ "\" (letra)], \"partizio-zenbakia\" (adibidez, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Lanpostua."
+
+#~ msgid "Server."
+#~ msgstr "Zerbitzaria."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Ingurumen Grafikoa."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Badira lau talde, sakatu talde bateko aurreko triangeluan zabaltzeko eta "
+#~ "zerbitzuak ikusteko."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Zure txartela ezin baduzu fabrikatzaile zerrendan aurkitu (oraindik datu-"
+#~ "basean ez delako sartu edo txartela zaharra delako) kontrolatzaile egokia "
+#~ "aurki dezakezu Xorg-en kategorian."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Instalatzaileak eskuragarri dauden leku partekatuko ditu honako arauen "
+#~ "arabera:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"lerrokatu\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Aurreko espazio librea (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Pantaila honetatik, posiblea da hobespen pertsonal batzuk ezartzea:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Hizkuntza (instalaziorako soilik, sisteman aukeratutako hizkuntzaren "
+#~ "desberdinak izan daitezke) F2 gakoa sakatuz (Ondare moduan soilik)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Hemen adibide bat dago, CD/DVD Live mota erabiltzean agertutako "
+#~ "Frantsesezko ongietorri pantaila. Nabaritu aipaturiko CD/DVDaren menuak "
+#~ "ez duela proposatzen: <guilabel>Berreskuratze Sistema</guilabel>, "
+#~ "<guilabel>Memoriaren Frogapena</guilabel> ezta <guilabel>Hardwarea "
+#~ "antzemateko tresnarik</guilabel> ere."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Gehitu kernel aukera batzuk <emphasis role=\"bold\">F6</emphasis> ondare "
+#~ "moduan edo <emphasis role=\"bold\">e</emphasis> sakatuz  UEFI modurako."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Instalazioak huts egiten badu, orduan berriro beste aukera osagarri "
+#~ "batzuekin saiatzea beharrezkoa izan daiteke. F6 sakatzen duzunean "
+#~ "agertzen den menuak lerro <guilabel>Abio aukarak</guilabel> berri bat "
+#~ "erakusten du eta lau aukera proposatzen ditu:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Gehitu kernel aukera gehiago F1 tekla (Ondare moduan soilik) sakatuz."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Kabledun sarea erabiltzen"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Hona hemen hasierako pantaila kable sare instalazioan oinarritzen CD bat "
+#~ "erabiltzen denean (netinstall.iso edo netinstall-nonfree.iso imajinak)"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Ezin duzu hizkuntza aldatu, aukerak pantailan azaltzen dira. Haridun "
+#~ "Sarean oinarritutako instalazio CDa  nola erabiltzeari buruzko informazio "
+#~ "gehiago lortzeko, bisitatu <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">Mageiaren Wiki-a</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Teklatuaren diseinua amerikarra da."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr "\"X-ekin\" hautatzen bada, IceWM idazmahai arin gisa egongo da."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Zure segurtasun maila egokitu dezakezu hemen."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Zuk zer aukeratu ez badakizu, lehenetsitako konfigurazioa utz ezazu."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE media: benetako Mageia sistema bat abiarazi dezakezu instalatu gabe, "
+#~ "instalazioa egin ondoren zer egin ikusteko. Instalazio prozesua errazagoa "
+#~ "da, baina aukera txikiagoak lortuko dituzu."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Abioko CD baliabidea soilik"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Egiaztatu Fitxategia Gorde botoia."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "dd kontsola tresna bezala ere erabil dezakezu:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Deskonektatu zure USB, eginda dago"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "<application>Mageia</application> bertsio bat edo gehiago instalaturik "
+#~ "baduzu zure siteman, instalatzaileak haietako bat azken bertiora "
+#~ "eguneratzea utziko dizu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Jarraibideak"
diff --git a/docs/docs/stable/installer/fr.po b/docs/docs/stable/installer/fr.po
index c2d1cd7e..0562ef8e 100644
--- a/docs/docs/stable/installer/fr.po
+++ b/docs/docs/stable/installer/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-26 20:58+0000\n"
 "Last-Translator: Yves Brungard\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -41,12 +41,13 @@ msgstr "Licence et Notes de version"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -80,8 +81,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Pour accepter, simplement sélectionner <guilabel>Accepter</guilabel> puis "
@@ -104,9 +106,10 @@ msgstr "Notes de version"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Des informations importantes sur cette version de <application>Mageia</"
@@ -114,13 +117,13 @@ msgstr ""
 "<guibutton>Release Notes</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "fr"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Sélection de média (Configurer l'installation de média supplémentaires)"
@@ -129,23 +132,25 @@ msgstr ""
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"add_supplemental_media."
 "png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-add_supplemental_media-"
 "im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Cet écran liste toutes les sources déjà disponibles. Il est possible "
 "d'ajouter des sources supplémentaires de paquetages, comme un disque optique "
@@ -153,23 +158,25 @@ msgstr ""
 "seront disponibles à l'installation lors des étapes suivantes."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Pour une source sur le réseau, deux étapes sont nécessaires :"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "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:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "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 "
@@ -177,14 +184,15 @@ msgstr ""
 "l'URL, vous pouvez désigner un dépôt spécifique de votre propre réseau NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "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 "
@@ -201,7 +209,7 @@ msgstr "Gestion de l'Utilisateur et du Superutilisateur"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -214,21 +222,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Définir le mot de passe Administrateur (Root) :"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Pour chaque installation de Mageia, il est conseillé de définir un mot de "
 "passe superutilisateur ou administrateur, souvent appelé <emphasis>mot de "
@@ -240,9 +248,10 @@ msgstr ""
 "fait une erreur de saisie."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Tous les mots de passe sont sensibles à la casse, il est recommandé "
@@ -250,16 +259,18 @@ msgstr ""
 "autres caractères."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Indiquer un utilisateur"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Ajouter ici un utilisateur. Il a moins de droits que le superutilisateur "
 "(root), mais suffisamment par défaut pour naviguer sur internet, utiliser "
@@ -267,7 +278,7 @@ msgstr ""
 "habituellement réalisées par un utilisateur ordinaire avec son PC."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -276,7 +287,7 @@ msgstr ""
 "l'icône de l'utilisateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -285,10 +296,11 @@ msgstr ""
 "l'utilisateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Identifiant de connexion</guilabel> : inscrire ici un identifiant "
@@ -296,40 +308,42 @@ msgstr ""
 "<emphasis>L'identifiant de connexion est sensible à la casse.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Password</guilabel> : dans ce champ vous devez saisir le mot de "
 "passe utilisateur. Un pictogramme à côté du champ indique la \"force\" du "
 "mot de passe (voir également <xref linkend=\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Mot de passe (vérification) </guilabel>: inscrire à nouveau le mot "
-"de passe ici et drakx vérifiera que le même mot de passe a bien été saisi "
-"dans les deux champs."
+"<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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -338,89 +352,60 @@ msgstr ""
 "emphasis>. Choisir <emphasis>Gestion des utilisateurs</emphasis> "
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Les permissions d'accès peuvent aussi être changées après l'installation."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gestion avancée de l'Utilisateur"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Si vous cliquez sur le bouton <guibutton>Avancé</guibutton>, un écran vous "
 "permet de modifier les réglages pour l'utilisateur que vous avez ajouté."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "En complément, vous pouvez activer ou désactiver un compte invité."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Tout ce qu'un invité, possédant un compte invité par défaut <emphasis>rbash</"
-"emphasis>, enregistre dans son répertoire /home sera effacé lors de la "
-"déconnexion. Un invité peut enregistrer ses fichiers importants sur une clé "
-"USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Activer le compte Invité </guilabel>: il est possible ici "
-"d'activer ou de désactiver un compte Invité. Ce type de compte permet à un "
-"invité de se connecter et d'utiliser le PC, mais avec des droits plus "
-"restreints qu'un utilisateur ordinaire."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell 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 "
 "choix possibles sont Bash, Dash et Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID de l'Utilisateur </guilabel>: Indiquer ici l'ID de "
 "l'utilisateur créé dans l'écran précédent. Il s'agit d'un nombre. Ne rien "
 "entrer ici si vous ne le connaissez pas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID du groupe </guilabel>: Indiquer ici l'ID du groupe.  Il s'agit "
-"encore d'un nombre, généralement le même que l'ID de l'utilisateur. Ne rien "
-"entrer ici si vous ne le connaissez pas."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Choix des points de montage"
 
@@ -437,13 +422,14 @@ msgstr "Choix des points de montage"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -453,7 +439,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -465,41 +451,45 @@ msgstr ""
 "montage."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "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:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Chaque partition est présentée comme suit : \"Périphérique\" (\"Capacité\", "
 "\"Point de montage\", \"Type\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Périphérique\", est composé de : \"type disque dur\", \"lettre d'ordre du "
-"disque dur \", \"numéro de partition\" (exemple, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Si vous avez beaucoup de partitions, vous pouvez choisir beaucoup de points "
 "de montage dans la liste déroulante tels que <literal>/</literal>, <literal>/"
@@ -509,20 +499,22 @@ msgstr ""
 "la partition <literal>/home</literal> d'une installation de cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Pour les partitions où l'accès n'est pas nécessaire, vous pouvez laisser le "
 "champ point de montage en blanc."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Si vous ne savez pas quoi choisir, cliquez sur <guibutton>Précédent</"
 "guibutton> et cochez <guilabel>Partitionnement personnalisé du disque</"
@@ -530,7 +522,7 @@ msgstr ""
 "type et sa taille."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -804,8 +796,9 @@ msgstr "Sélection du bureau"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "En fonction des sélections faites ici, des écrans supplémentaires peuvent "
@@ -813,8 +806,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -833,14 +827,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Choisir entre les bureaux <application>KDE</application> ou "
 "<application>Gnome</application> suivant sa préférence. Les deux proposent "
@@ -868,8 +864,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -881,62 +878,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Poste de travail."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionnement de partition :</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Serveur."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Environnement graphique"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Sélection Individuelle des Paquetages : Utiliser cette option pour ajouter "
 "ou retirer manuellement des paquetages."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Voir <xref linkend=\"minimal-install\"/> pour obtenir des instructions sur "
 "comment réaliser une installation minimale (avec ou sans X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Choisir individuellement des paquetages"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Il est possible ici d'ajouter n'importe quel paquetage supplémentaire pour "
 "personnaliser l'installation."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -952,47 +956,45 @@ msgstr ""
 "choisissant de charger le fichier."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configurer les Services"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Désigner ici quels services doivent (ne doivent pas) s'activer au démarrage "
 "du système."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Il y a quatre groupes, cliquer sur le triangle devant chaque groupe pour le "
-"déployer et voir tous les services qu'il contient."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Les choix réalisés par DrakX sont généralement les bons."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -1001,7 +1003,7 @@ msgstr ""
 "disponibles dans l'infobulle en dessous."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Ne modifier quelque chose qu'avec la certitude de bien faire."
 
@@ -1014,12 +1016,13 @@ msgstr "Configurer le fuseau horaire"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1029,18 +1032,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Choisir le 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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Dans l'écran suivant, il est possible de régler l'horloge système à l'heure "
 "locale ou GMT, aussi appelée UTC."
@@ -1055,23 +1060,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:11
+#: en/configureX_card_list.xml:13
 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:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1080,7 +1085,7 @@ msgstr ""
 "graphiques et identifie en général correctement votre matériel."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1089,37 +1094,30 @@ msgstr ""
 "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:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "le vendeur"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "nom de la carte graphique"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "et le type de carte."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Si vous ne trouvez pas votre carte dans la liste du fabricant, parce qu'elle "
-"n'est pas encore répertoriée ou qu'elle est trop ancienne, vous pouvez "
-"espérer trouver un pilote adapté dans la catégorie <emphasis>Xorg</emphasis>."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "La catégorie <emphasis>Xorg</emphasis> contient plus de 40 pilotes "
 "génériques et libres. Si vous ne trouvez pas de pilotes correspondant à "
@@ -1127,20 +1125,22 @@ msgstr ""
 "qui fournit des possibilités basiques pour la plupart des cartes."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Soyez conscients que vous n'aurez accès qu'à la ligne de commande si le "
 "pilote sélectionné est inadapté."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Certains pilotes sont fournis par les fabricants et en licence non ouverte "
 "et ne peuvent être installés que si vous avez accepté le dépôt \"Nonfree\"."
@@ -1148,42 +1148,45 @@ msgstr ""
 "Internet du fabricant et sont à installer après le démarrage de Mageia."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Les dépôts \"Nonfree\" doivent être activés de façon explicite pour y "
 "accéder, il est conseillé de le faire après le premier redémarrage."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupX.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"configureX-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Quelque soit l'environnement graphique (connu aussi sous le nom de bureau) "
 "choisi pour cette installation de <application>Mageia</application>, il est "
@@ -1196,7 +1199,7 @@ msgstr ""
 "rien ou bien si les choix réalisés ne semblent pas corrects."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1205,13 +1208,14 @@ msgstr ""
 "choisir la carte dans la liste."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Moniteur</guibutton></emphasis>: Choisir "
 "<guilabel>Plug'n Play</guilabel> quand cela est possible, ou choisir le "
@@ -1221,31 +1225,32 @@ msgstr ""
 "rafraîchissement horizontaux et verticaux du moniteur."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 "Le moniteur peut être endommagé par des taux de rafraîchissement incorrects."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Résolution</guibutton></emphasis>: Indiquer ici la "
 "résolution et la profondeur de couleur du moniteur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Le bouton test n'apparaît "
 "pas toujours pendant l'installation. S'il est présent, il est possible de "
@@ -1257,7 +1262,7 @@ msgstr ""
 "redoubler de précautions dans le choix des paramètres.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1266,12 +1271,12 @@ msgstr ""
 "ou d'invalider différentes options."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Choisissez un moniteur"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1280,12 +1285,13 @@ msgstr ""
 "votre matériel est bien identifié."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Le choix d'un moniteur avec des caractéristiques inappropriées au "
 "matériel peut endommager la carte graphique ou le moniteur, en particulier "
@@ -1293,23 +1299,23 @@ msgstr ""
 "cas de doute, vous devez consulter la documentation de votre matériel."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personnalisé</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1323,7 +1329,7 @@ msgstr ""
 "horizontale détermine la fréquence à laquelle les lignes sont affichées."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1337,12 +1343,12 @@ msgstr ""
 "de votre matériel."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1351,12 +1357,12 @@ msgstr ""
 "moniteur à partir de la base de données."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Vendeur</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1366,28 +1372,30 @@ msgstr ""
 "en sélectionnant dans l'ordre :"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "le nom du fabricant du moniteur"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "la description du moniteur."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Générique</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "La sélection de ce groupe permet de choisir parmi 30 configurations "
 "d'affichage telles que le 1024x768 @ 60Hz et comprend les écrans plats tels "
@@ -1397,12 +1405,12 @@ msgstr ""
 "prudent dans vos choix."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partitionnement personnalisé du disque avec DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1413,12 +1421,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Si vous souhaitez chiffrer la partition <literal>/</literal> il faut d'abord "
 "s'assurer que la partition <literal>/boot</literal> est séparée des autres. "
@@ -1426,11 +1436,12 @@ msgstr ""
 "système ne pourra pas s'amorcer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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 "
@@ -1438,32 +1449,32 @@ msgstr ""
 "modifications."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Un onglet est présent pour chaque disque dur détecté et chaque autre "
-"périphérique de stockage tel qu'une clé USB. Par exemple sda, sdb et sdc "
-"s'ils sont trois."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Cliquer sur <guibutton>Supprimer toutes les partitions</guibutton> pour "
 "supprimer toutes les partitions du périphérique de stockage sélectionné."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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 "
@@ -1473,32 +1484,34 @@ msgstr ""
 "partition."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continuer jusqu'à ce que tout soit conforme aux désirs."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1506,12 +1519,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1521,7 +1534,7 @@ msgstr ""
 "possède le type requis."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1534,32 +1547,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitionnement"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Cet écran présente le contenu du(des) disque(s) dur(s) et les propositions "
 "faites par l'assistant de partitionnement de DrakX pour l'endroit où "
 "installer <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Les options proposées dans la liste ci-dessous varient en fonction du "
 "contenu et de l'agencement de chaque disque dur en particulier."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1572,12 +1587,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Utiliser les partitions existantes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1586,12 +1601,12 @@ msgstr ""
 "ont été trouvées et sont utilisables pour l'installation de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Utiliser l'espace libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1600,12 +1615,12 @@ msgstr ""
 "l'utilisera pour l'installation de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utiliser l'espace libre sur une partition Microsoft Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1614,7 +1629,7 @@ msgstr ""
 "l'installateur propose de l'utiliser."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1625,7 +1640,7 @@ msgstr ""
 "assurer de posséder une sauvegarde de tous les fichiers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1643,12 +1658,14 @@ msgstr ""
 "préalable."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Avec cette option, l'installateur affiche la partition Windows restante en "
 "bleu clair et la future partition Mageia en bleu foncé, avec leurs tailles "
@@ -1657,37 +1674,39 @@ msgstr ""
 "capture d'écran ci-dessous."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Effacer et utiliser le disque tout entier"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Cette option utilise le disque complet pour Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "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:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1698,12 +1717,12 @@ msgstr ""
 "perdues, alors ne pas utiliser cette option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Partitionnement de disque personnalisé"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1712,72 +1731,86 @@ msgstr ""
 "installation sur le(s)  disque(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionnement de partition :</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"L'installeur partagera l'espace disponible selon les règles suivantes :"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Si l'espace total disponible est inférieur à 50 Go, une seule partition est "
 "créée pour le répertoire racine /, il n'y a aucune partition distincte pour /"
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "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:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19ème de l'espace total disponible est alloué à la racine principale des "
 "répertoires /, jusqu'à un maximum de 50 Go."
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19ème est alloué au SWAP avec un maximum de 4 Go."
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 "Le reste (à minima 12/19ème) est alloué au répertoire utilisateur /home."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Cela signifie que pour un espace disponible de 160 Go et plus, l'installeur "
 "créera trois partitions : 50 Go pour /, 4 Go pour le SWAP et le reste pour /"
 "home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "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 "
@@ -1785,13 +1818,14 @@ msgstr ""
 "seule qui permet de vérifier si l'opération a été effectuée correctement "
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "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 "
@@ -1801,7 +1835,7 @@ msgstr ""
 "sélectionner \"BIOS boot partition\" comme type de système de fichiers."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1812,7 +1846,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1821,15 +1855,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Certains nouveaux disques utilisent maintenant des secteurs logiques de 4096 "
 "octets, au lieu des traditionnels 512 octets.  En raison d'un manque de "
@@ -1841,19 +1876,22 @@ msgstr ""
 "suivante :"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Align to\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Assurez vous aussi que toutes les partitions sont créées avec un nombre pair "
 "de Mo."
@@ -1864,7 +1902,7 @@ 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:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1879,18 +1917,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "La documentation officielle de Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1902,7 +1940,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1914,7 +1952,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1926,13 +1964,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1944,26 +1982,34 @@ msgstr ""
 "vous faites."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation avec DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Février 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1971,7 +2017,7 @@ msgstr "Félicitations"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1980,7 +2026,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1991,17 +2037,18 @@ msgstr ""
 "et de redémarrer l'ordinateur."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Après le redémarrage, le choix entre les différents systèmes d'exploitation "
 "présents sur l'ordinateur (s'il en existe plus d'un) est possible dans "
 "l'écran du chargeur de démarrage ."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2010,12 +2057,12 @@ msgstr ""
 "l'installation de Mageia sera automatiquement sélectionnée et démarrée."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Prenez plaisir !"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2030,11 +2077,12 @@ msgstr "Pare-feu"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Cette section vous permet de configurer quelques règles simples de pare-"
 "feu : elles déterminent quel type de message en provenance d'Internet seront "
@@ -2043,15 +2091,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Dans la configuration par défaut, aucune case n'est cochée - aucun service "
 "n'est accessible de l'extérieur. Le bouton <emphasis>Tout (pas de pare-feu)</"
@@ -2064,10 +2113,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Toutes les autres cases à cocher se comprennent directement. Comme exemple, "
 "vous cocherez \"Serveur CUPS\" si vous souhaitez que les imprimantes de "
@@ -2080,12 +2130,11 @@ msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "La liste des cases à cocher comprend uniquement les services les plus "
 "courants. Le bouton <emphasis>Avancé</emphasis> ouvre une fenêtre où vous "
@@ -2093,12 +2142,12 @@ msgstr ""
 "séparés par des espaces "
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2109,7 +2158,7 @@ msgstr ""
 "défini dans la spécification <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2119,7 +2168,7 @@ msgstr ""
 "service."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2128,7 +2177,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2137,7 +2186,7 @@ msgstr ""
 "indiquer deux couples pour le même port."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatage"
 
@@ -2146,14 +2195,14 @@ msgstr "Formatage"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2163,24 +2212,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Choisir ici quelle(s)  partition(s) est(sont) à formater. Toutes les données "
 "présentes sur les partitions <emphasis>non</emphasis> cochées seront "
 "préservées."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Habituellement, au moins les partitions sélectionnées par DrakX doivent être "
 "formatées."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2190,12 +2240,13 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Si vous n'êtes pas encore sûr de votre choix, cliquer sur "
 "<guibutton>Précédent</guibutton>, à nouveau sur <guibutton>Précédent</"
@@ -2204,7 +2255,7 @@ msgstr ""
 "des partitions."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2213,12 +2264,12 @@ msgstr ""
 "<guibutton>Suivant</guibutton> pour continuer."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'installateur de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2229,7 +2280,7 @@ msgstr ""
 "mise à jour aussi aisée que possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2239,37 +2290,41 @@ msgstr ""
 "plupart du temps ."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: 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:19
+#: 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:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "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:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "A partir de cet écran, vous pouvez accéder à des options en pressant la "
 "lettre \"e\" pour entrer dans le mode d'édition. Pour revenir à cet écran, "
@@ -2277,123 +2332,113 @@ msgstr ""
 "\"Ctrl\" ou \"F10\" pour quitter en sauvegardant. "
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"A partir de cet écran, il est possible de paramétrer des préférences "
-"personnelles :"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Sélectionner la langue en pressant la touche F2 (en mode Grub Legacy "
-"uniquement). Il s'agit seulement de la langue pour l'installation (elle peut "
-"être différente de la langue sélectionnée pour le système)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Utilisez les touches fléchées pour sélectionner la langue puis presser sur "
 "la touche Entrée."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Voici par exemple l'écran d'accueil en Français si vous utilisez in DVD/CD "
-"\"live\". Notez que le menu du DVD/CD \"live\" ne propose pas : le "
-"<guilabel>système de secours</guilabel>, le <guilabel>test de mémoire</"
-"guilabel> et <guilabel>l'outil de détection du matériel</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Modifier la résolution de l'écran en pressant la touche F3 (en mode Grub "
 "Legacy uniquement)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Ajouter certaines options du noyau en pressant la touche <emphasis role="
-"\"bold\">F6</emphasis> en mode Grub Legacy ou la touche <emphasis role=\"bold"
-"\">e</emphasis> en mode UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- par défaut. 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
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Si l'installation échoue, il peut alors être nécessaire de réessayer en "
-"utilisant l'une des options  spéciales. Le menu appelé par la touche F6 "
-"affiche une nouvelle ligne appelée  <guilabel>Options de démarrage</"
-"guilabel> et propose quatre entrées :"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- par défaut. Cela ne modifie rien dans les options par défaut."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- pas d'ACPI (Advanced Configuration and Power Interface), la gestion de "
 "l'alimention n'est pas prise en compte."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Pas d'APIC (Advanced Programmable Interrupt Controller) local. Ceci ne "
 "concerne que le fonctionnement interne de l'Unité Centrale, sélectionnez "
 "cette option uniquement si on vous le demande."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2402,11 +2447,12 @@ msgstr ""
 "défaut affichées dans la ligne <guilabel>Options de démarrage</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Dans certaines versions de Mageia, il peut arriver que les entrées "
 "sélectionnées avec la touche F6 n'apparaissent pas dans la ligne "
@@ -2414,25 +2460,20 @@ msgstr ""
 "en compte."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Ajouter plus d'options du noyau en pressant la touche F1 (en mode Grub "
-"Legacy uniquement)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Presser la touche F1 ouvre une nouvelle fenêtre avec plus d'options "
 "disponibles. Sélectionnez-en une avec les touches directionnelles, puis "
@@ -2440,19 +2481,20 @@ msgstr ""
 "Esc pour revenir vers l'écran d'accueil."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "La vue détaillée sur l'option splash. Pressez la touche Echappement ou "
 "sélectionnez <guilabel>Retournez vers les options de démarrage</guilabel> "
@@ -2460,20 +2502,23 @@ msgstr ""
 "manuellement sur la ligne <guilabel>options de Démarrage</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "L'aide est traduite dans la langue sélectionnée en pressant la touche F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2484,81 +2529,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Utilisation d'un réseau filaire"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Voici l'écran d'accueil par défaut si vous utilisez un CD d'installation par "
-"le Réseau (les images netinstall.iso ou netinstall-nonfree.iso) :"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Cela ne permet pas de modifier la langue, les options disponibles sont "
-"décrites dans l'écran. Pour plus d'information sur l'utilisation d'un CD "
-"d'installation par le Réseau, consulter <link ns2:href=\"https://wiki.mageia."
-"org/en/Boot.iso_install\">le Wiki Mageia</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Le clavier est Américain."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Les étapes de l'installation"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "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:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Chaque étape contient un ou plusieurs écrans qui peuvent à leur tour "
 "présenter un bouton <guibutton>Avancé</guibutton> qui offre des options "
 "supplémentaires moins communes."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "La plupart des écrans présentent un bouton d'<guibutton>Aide</guibutton> qui "
 "apporte davantage d'explications au sujet de l'étape en cours."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2577,17 +2589,17 @@ msgstr ""
 "pour redémarrer."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problèmes d'installation et solutions possibles"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Pas d'interface graphique"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2599,13 +2611,16 @@ msgstr ""
 "l'invite."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Si le matériel est très ancien, une installation graphique pourrait être "
 "impossible. Dans ce cas il vaut mieux essayer une installation en mode "
@@ -2615,12 +2630,12 @@ msgstr ""
 "l'installation en mode texte."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "L'installation se fige"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2635,14 +2650,15 @@ msgstr ""
 "avec les précédentes si nécessaire.."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problème de mémoire vive"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2654,18 +2670,20 @@ msgstr ""
 "spécifier 256Mo de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Partitions dynamiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Si vous avez converti votre disque dur d'un format \"primaire\" vers un "
 "format \"dynamique\" dans Microsoft Windows, vous devez savoir qu'il est "
@@ -2684,18 +2702,18 @@ msgstr "Mises à jour"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2704,10 +2722,11 @@ msgstr ""
 "un certain nombre de paquets ont été mis à jour ou améliorés."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Choisissez <guilabel>oui</guilabel> si vous souhaitez les télécharger et les "
@@ -2715,8 +2734,9 @@ msgstr ""
 "pas, ou si vous n'êtes pas connecté à Internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Cliquer sur <guibutton>Suivant</guibutton> pour continuer"
 
 #. type: Content of: <section><info><title>
@@ -2775,18 +2795,18 @@ msgstr "Sélection des média (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2799,7 +2819,7 @@ msgstr ""
 "suivantes."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2808,7 +2828,7 @@ msgstr ""
 "de la distribution."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2823,13 +2843,14 @@ msgstr ""
 "graphiques nVidia et ATI, les firmwares de diverses cartes Wifi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Le dépôt <emphasis>Tainted</emphasis> comprend les paquetages publiés sous "
 "licence libre. La principale raison qui fait placer un paquetage dans ce "
@@ -2839,38 +2860,41 @@ msgstr ""
 "jouer des DVD vidéo commerciaux, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Installation minimale"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "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\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Si vous le souhaitez, vous pouvez également cocher l'option \"Sélection "
 "individuelle des paquetages\" dans le même écran."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "L'installation minimale est destinée à ceux qui utilisent "
 "<application>Mageia</application> pour des cas spécifiques, tels qu'un "
@@ -2880,25 +2904,24 @@ msgstr ""
 "de détails, consultez <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Avec le choix de cette classe d'installation, l'écran suivant propose "
 "d'installer quelques extras utiles tels que de la documentation et X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Si vous avez sélectionné \"Avec X\", il incluera également IceWM en tant "
-"qu'environnement de bureau léger."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2913,15 +2936,15 @@ msgstr ""
 "\">utilitaires GNU</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2938,11 +2961,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX a fait les choix 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 possible "
@@ -2951,9 +2975,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "En régle générale, les paramètres par défaut sont recommandés et vous pouvez "
 "les garder, sauf trois exceptions :"
@@ -2970,73 +2995,77 @@ 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 "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 "Une recommandation contraire est donnée dans les sections détaillées ci-"
 "dessous"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Paramètres du système"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuseau horaire :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX a sélectionné un fuseau horaire en fonction de la langue préférée. Le "
 "modifier si nécessaire. Voir aussi <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Pays / Région :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Si vous ne vivez pas dans le pays sélectionné, il est très important de "
 "rectifier. Voir <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Chargeur de démarrage : </guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "DrakX 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:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Ne changez rien à moins de bien savoir comment configurer Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Pour plus d'informations, voir <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestion de l'utilisateur :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3045,22 +3074,23 @@ msgstr ""
 "verra attribuer son propre répertoire <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Services :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Les services systèmes sont ces petits programmes exécutés en tâche de fond "
 "(démons). Cet outil permet d'autoriser ou interdire l'exécution de certaines "
 "tâches."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3069,31 +3099,32 @@ msgstr ""
 "erreur peut empêcher le fonctionnement correct de l'ordinateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Pour plus d'informations, voir <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Paramètres du matériel"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Clavier </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "C'est l'endroit où configurer la disposition du clavier, lequel dépend du "
 "pays, de la langue ou du type de clavier."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3102,12 +3133,12 @@ msgstr ""
 "perdez pas de vue que vos mots de passe changeront aussi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Souris :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3116,40 +3147,41 @@ msgstr ""
 "trackballs etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Carte son :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "L'installeur sélectionne le pilote par défaut, s'il en existe un. L'option "
 "de sélection d'un pilote différent n'est fournie 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:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interface graphique : </guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "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:141
+#: 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:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3158,20 +3190,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Paramètres réseau et internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Réseau :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3182,21 +3215,22 @@ msgstr ""
 "libres (nonfree)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Lors de l'ajout d'une carte réseau, ne pas oublier de paramétrer le pare-feu "
 "pour qu'il surveille aussi cette interface."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3207,26 +3241,27 @@ msgstr ""
 "configurer votre ordinateur pour qu'il utilise un service proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "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:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sécurité"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Niveau de sécurité</guilabel> :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3235,18 +3270,18 @@ msgstr ""
 "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:205
+#: 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:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Pare-feu</guilabel> :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3256,7 +3291,7 @@ msgstr ""
 "cherchent à les compromettre ou à les voler."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3267,7 +3302,7 @@ msgstr ""
 "d'informations, voir <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Garder à l'esprit que tout autoriser (pas de pare-feu) est très risqué."
@@ -3336,39 +3371,73 @@ msgstr ""
 "taille afin de pouvoir installer <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionnement de partition :</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Choisir ici le niveau de sécurité souhaité."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancé</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Laisser les valeurs par défaut si les choix à faire sont inconnus."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "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 "
@@ -3386,25 +3455,27 @@ msgstr "Introduction"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia est distribuée via des images ISO. Cette page vous aidera à choisir "
 "quelle image correspond à vos besoins."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Il existe deux familles de media :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Installation classique : Après le démarrage du média, suivra un processus "
 "vous autorisant à choisir quoi installer et comment configurer votre système "
@@ -3413,83 +3484,87 @@ msgstr ""
 "souhaitez installer. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Media LIVE : vous pouvez démarrer les media avec un vrai système Mageia sans "
-"l'installer, pour découvrir ce que vous obtiendrez après installation. Le "
-"processus d'installation est plus simple, mais vous aurez moins de choix."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "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:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Définition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "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 sur lequel le fichier ISO est copié."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Vous pouvez les trouver <link ns4:href=\"http://www.mageia.org/fr/downloads/"
 "\">ici</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Média d'installation classique"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Caractéristiques communes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Ces images ISOs utilisent l'installeur classique appelé Drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Ils peuvent réaliser une nouvelle installation ou une mise à jour à partir "
 "de versions précédentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "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:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3498,13 +3573,13 @@ msgstr ""
 "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:60
+#: en/SelectAndUseISOs2.xml:58
 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:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3512,102 +3587,107 @@ msgstr ""
 "libres."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Média \"Live\""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Peut être utilisé pour tester la distribution Mageia sans l'installer sur le "
 "disque dur, puis éventuellement l'installer par la suite."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "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:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Les ISO Live peuvent être utilisées uniquement pour "
 "des installations nouvelles, elles ne peuvent pas l'être pour mettre à "
 "niveau de précédentes versions.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Ils contiennent des logiciels non-libres."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "DVD Live Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Environnement de bureau Plasma uniquement"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Toutes les langues sont présentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Architecture 64 bits uniquement."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "DVD Live GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Environnement de bureau GNOME uniquement."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "DVD Live Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Environnement de bureau Xfce uniquement."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "Architecture 32 bits et 64 bits."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Média de simple démarrage"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3619,28 +3699,30 @@ msgstr ""
 "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:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "En anglais uniquement."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3674,11 +3756,12 @@ msgstr "Téléchargement"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Une fois choisi votre fichier ISO, vous pouvez le télécharger en utilisant "
 "un lien direct HTTP soit BitTorrent. Dans les deux cas, une fenêtre vous "
@@ -3693,10 +3776,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum, 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 "
@@ -3710,8 +3794,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Cochez le bouton radio \"Sauvegarder un fichier\""
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3719,14 +3803,15 @@ 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:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Les deux sommes de contrôle sont des nombres hexadécimaux calculés par un "
 "algorithme à partir du fichier à télécharger. Lorsque l'on demande à ces "
@@ -3737,69 +3822,84 @@ msgstr ""
 "réparation avec BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Ouvrir une console, sans être administrateur, et :"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Pour utiliser md5sum, taper :  [sam@localhost]$ <userinput>md5sum chemin/"
 "vers/le/fichier/image.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Pour utiliser sha1sum, taper :  [sam@localhost]$ <userinput>sha1sum chemin/"
 "vers/le/fichier/image.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"et comparer le nombre obtenu sur votre ordinateur (cela peut prendre un "
-"certain temps) avec le nombre fourni par Mageia. Exemple :"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"et comparer le nombre obtenu sur votre ordinateur (cela peut prendre un "
+"certain temps) avec le nombre fourni par Mageia. Exemple :"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Graver ou copier l'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "L'ISO peut désormais être gravée sur un CD, un DVD ou copiée sur une clé "
 "USB. Ces opérations ne sont pas de simples copies et sont destinées à créer "
 "un moyen de démarrage."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 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:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Utilisez le logiciel de gravure de votre choix mais assurez-vous que le "
 "périphérique de gravure est bien paramétré pour <emphasis role=\"bold"
@@ -3808,12 +3908,12 @@ msgstr ""
 "mageia.org/en/Writing_CD_and_DVD_images\">le wiki Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Copier l'image ISO sur une clé USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3823,18 +3923,19 @@ msgstr ""
 "le système."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"Copier\" une image sur un équipement de type Flash détruit tout le système "
 "de fichier présent à l'origine sur la partition ; toutes les données seront "
 "perdues et la capacité de la partition sera réduite à la taille de l'image."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3843,12 +3944,12 @@ msgstr ""
 "le partitionnement et reformater la clé."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 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:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3858,73 +3959,72 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Utiliser un outil graphique dans Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Vous pouvez essayer :"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> en "
 "utilisant l'option \"image ISO\" ;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Utiliser la ligne de commande avec le système GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Il est potentiellement très dangereux de le faire manuellement. Vous risquez "
 "d'écrire par-dessus une partition du disque si vous saisissez le mauvais ID."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Vous pouvez également utiliser l'outil dd dans une console :"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Ouvrir une console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Devenir administrateur avec la commande <userinput>su -</userinput> (ne pas "
 "oublier le '-' final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3934,29 +4034,42 @@ msgstr ""
 "ou la lire)."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Saisissez la commande <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Trouver le nom du périphérique de votre clé USB (par sa taille), par exemple "
+"dans la capture d'écran ci-dessus le nom est <code>/dev/sdb</code>, pour une "
+"clé USB de 8 Go."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "D'une autre manière, vous pouvez récupérer le nom du périphérique avec la "
 "commande <code>dmesg</code> ; à la fin de l'affichage, vous visualisez le "
 "nom du périphérique commençant par <emphasis>sd</emphasis> et <emphasis>sdd</"
 "emphasis> comme dans ce cas :"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3998,47 +4111,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Trouver le nom du périphérique de votre clé USB (par sa taille), par exemple "
-"dans la capture d'écran ci-dessus le nom est <code>/dev/sdb</code>, pour une "
-"clé USB de 8 Go."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Saisissez la commande : # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Où X=le nom de votre périphérique, par exemple : /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Exemple : # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Saisissez la commande : # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Débranchez votre clé USB, c'est terminé."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4069,19 +4190,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Si le pays désiré n'est pas dans la liste, cliquer sur le bouton "
 "<guilabel>Autres pays</guilabel> et choisir ici le pays ou la région."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Si le pays désiré ne figure que dans la liste <guilabel>Autres pays</"
@@ -4090,18 +4213,19 @@ msgstr ""
 "DrakX respectera votre choix."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Méthode de saisie"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Dans l'écran <guilabel>Autres pays</guilabel> vous pouvez aussi choisir une  "
@@ -4114,11 +4238,13 @@ msgstr ""
 "paquetage."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Si la méthode de saisie n'est pas configurée pendant la phase "
 "d'installation, vous pouvez le faire après le démarrage de Mageia par "
@@ -4126,56 +4252,54 @@ msgstr ""
 "\"localedrake\" en tant que super-utilisateur."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installation ou Mise à jour"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectinstallClass.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installation"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Choisir cette option pour une nouvelle installation de <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Mise à jour"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Si vous disposez de plus d'une installation <application>Mageia</"
-"application> sur votre ordinateur, l'installeur vous permettra de mettre à "
-"niveau l'une d'entre elles avec la dernière version Mageia."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Seule la mise à niveau d'une précédente version de Mageia <emphasis>encore "
 "supportée</emphasis> a été complètement testée. Si vous désirez mettre à "
@@ -4184,16 +4308,17 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "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. "
@@ -4206,12 +4331,14 @@ msgstr ""
 "pour redémarrer."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "En cas d'oubli de sélection d'une langue supplémentaire, il est possible de "
 "revenir depuis l'écran \"Installation ou mise à jour\" à l'écran de choix "
@@ -4248,12 +4375,12 @@ msgstr ""
 "votre fuseau hoaraire précédemment choisis."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Clavier"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4263,16 +4390,17 @@ msgstr ""
 "clavier US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\"/"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
 "> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4291,23 +4419,25 @@ msgstr ""
 "Disposition_des_touches_des_claviers_informatiques</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Si le clavier n'apparaît pas dans la liste présentée, cliquer sur "
 "<guibutton>Davantage</guibutton> pour obtenir une liste complète et y "
 "sélectionner le bon clavier."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Après le choix d'un clavier dans la liste obtenue grâce au clic sur "
 "<guibutton>Davantage</guibutton>, le premier choix de clavier revient à "
@@ -4316,23 +4446,24 @@ msgstr ""
 "sera bien celui de la liste complète."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "En cas de choix d'un clavier de caractères non-Latins, un écran "
 "supplémentaire apparaîtra pour demander quelle est la préférence pour le "
 "passage entre les dispositions latine et non latine."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Veuillez choisir la langue à utiliser"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4343,7 +4474,7 @@ msgstr ""
 "l'installation et pour le système une fois installé."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4352,12 +4483,13 @@ msgstr ""
 "cette sélection pendant l'installation et pour le système une fois installé."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "S'il est probable que plusieurs langues doivent être installées sur le "
 "système, pour vous-même ou pour d'autres utilisateurs, il est préférable "
@@ -4366,7 +4498,7 @@ msgstr ""
 "langues supplémentaires après l'installation."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4379,18 +4511,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Même avec l'intention d'installer plusieurs langues, il faut d'abord en "
 "choisir une en tant que langue préférée dans le premier écran. Elle sera "
 "aussi marquée comme choisie dans l'écran des langues multiples."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4399,23 +4532,24 @@ msgstr ""
 "conseillé d'installer également la langue du clavier correspondante."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia utilise par défaut le codage UTF-8 (Unicode)"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Ceci peut être désactivé dans l'écran \"langues multiples\" 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:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4472,69 +4606,74 @@ msgstr ""
 "à six boutons ou plus."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Ajouter ou Modifier une Entrée de Menu de Démarrage"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Pour cela, vous devez éditer manuellement /boot/grub2/custom.cfg ou bien "
 "utiliser le logiciel grub-customizer (disponible dans les dépots Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Pour en savoir plus, voir notre wiki <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/setupBootloader.xml:9
+#: 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:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Interface du programme d'amorçage"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: 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:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (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:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+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:29
+#: 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:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 sur des systèmes MBR/Legacy et GPT/Legacy "
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4547,29 +4686,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Ne modifiez pas le \"Périphérique de démarrage\", à moins que vous ne "
 "sachiez réellement ce que vous faites."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi sur des systèmes UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Avec un système UEFI, l'interface utilisateur est légèrement différente en "
 "raison de l'impossibilité de choisir entre avec ou sans menu graphique."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4582,14 +4726,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Si Mageia est le seul système installé sur votre ordinateur, l'installeur "
@@ -4601,37 +4746,42 @@ msgstr ""
 "d'exploitation que vous ayez."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: 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:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Par défaut, selon votre système, Mageia écrit un nouveau :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "Chargeur de boot GRUB2 soit dans le MBR (Master Boot Record) du premier "
 "disque dur ou bien dans la \"BIOS boot partition\" (partition BIOS "
 "d'amorçage)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Chargeur de boot Grub2-efi dans l'ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "S'il y a déjà d'autres systèmes d'exploitation d'installés, Mageia tente de "
 "les ajouter à votre nouveau menu d'amorçage Mageia. Si vous ne le voulez "
@@ -4639,7 +4789,7 @@ msgstr ""
 "<guilabel>Probe Foreign OS</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4652,18 +4802,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: 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:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "La procédure exacte pour ajouter le système Mageia dans un chargeur de "
 "démarrage existant sort du périmètre de cette aide, cependant, la plupart du "
@@ -4672,16 +4823,17 @@ msgstr ""
 "Voir la documentation du système d'exploitation en question."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Utilisation du chargement en chaîne"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Si vous ne désirez pas avoir Mageia bootable, mais la chaîner depuis un "
 "autre SE, cliquez sur <guibutton>Suivant</guibutton>, puis sur "
@@ -4689,7 +4841,7 @@ msgstr ""
 "l'ESP ou au MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4702,7 +4854,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4711,7 +4863,7 @@ msgstr ""
 "manquant, ignorez le en cliquant sur <guibutton>OK</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4720,33 +4872,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Première page"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Délai avant l'activation du choix par défaut</guilabel> : Cette "
 "entrée 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:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Sécurité</guilabel> : Il est possible ici d'établir un mot de "
 "passe pour le chargeur d'amorçage. Dans ce cas, un nom d'utilisateur "
@@ -4755,37 +4908,37 @@ msgstr ""
 "d’utilisateur est \"root\" 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:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Mot de passe</guilabel> : Indiquer le mot de passe dans ce champ "
 "de saisie."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>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><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Avancé</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Activer l'ACPI:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) est un standard de gestion de l'énergie. Il permet de réaliser "
@@ -4796,21 +4949,22 @@ msgstr ""
 "ou blocages)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Activer le SMP</guilabel> : SMP signifie Symmetric Multi "
 "Processors, c'est une architecture pour les processeurs multicores."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Enable APIC</guilabel> : Activer ou désactiver cela donne ou "
 "refuse au système d'exploitation l'accès au Contrôleur Programmable Avancé "
@@ -4819,29 +4973,30 @@ msgstr ""
 "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:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Enable Local APIC</guilabel> : Il est possible ici de valider "
 "l'APIC local, qui 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:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Page suivante"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>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:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4851,7 +5006,7 @@ msgstr ""
 "démarrage. "
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4860,11 +5015,12 @@ msgstr ""
 "\"setupMageiaBootloader\">Utiliser un chargeur de démarrage Mageia</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>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 "
@@ -4872,7 +5028,7 @@ msgstr ""
 "profondeur de couleurs vous seront proposées"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4882,7 +5038,7 @@ msgstr ""
 "chaîne</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Configuration du SCSI"
 
@@ -4895,37 +5051,39 @@ msgstr "Configuration du SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"setupSCSI-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX détecte habituellement les disques durs correctement. Il peut "
 "cependant échouer dans la détection de certains contrôleurs SCSI anciens et "
 "en conséquence être incapable d'installer les pilotes requis."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Si cela se produit, il faut indiquer manuellement à Drakx quel(s) "
 "périphérique(s) SCSI sont présents."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX pourra alors les configurer correctement."
 
@@ -4946,10 +5104,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Cette écran affiche le nom du pilote que l'installeur a choisi pour votre "
 "carte son. Ce sera le pilote par défaut si vous en avez un."
@@ -4972,26 +5130,30 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Puis, dans l'écran de configuration du son, cliquez sur <guibutton>Avancé</"
 "guibutton> puis sur <guibutton>Dépannage</guibutton> pour obtenir des "
 "conseils très utiles afin de résoudre le problème."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avancé"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Cliquer sur <guibutton>Avancé</guibutton> sur cet écran, lors de "
 "l'installation, est utile s'il y a plusieurs pilotes disponibles et aucun "
@@ -4999,16 +5161,17 @@ msgstr ""
 "pilote."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Dans ce cas vous pouvez sélectionner un pilote différent après avoir cliqué "
 "sur <guibutton>Choix d'un pilote</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmer le disque dur à formater"
 
@@ -5019,13 +5182,13 @@ msgstr "Confirmer le disque dur à formater"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -5035,18 +5198,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Cliquer sur <guibutton>Précédent</guibutton> en cas d'incertitude sur la "
 "sélection du bon disque dur."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Cliquer sur <guibutton>Suivant</guibutton> en cas de certitude avec la "
 "volonté d'effacer toutes les partitions, tous les systèmes d'exploitation et "
@@ -5172,16 +5338,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Désinstaller Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Guide"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Mageia ne vous convient pas ou vous ne pouvez pas l'installer correctement, "
@@ -5189,28 +5351,30 @@ msgstr ""
 "donne la possibilité de le désinstallé. Ceci n'est pas vrai pour tous les "
 "systèmes d'exploitation."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Après votre sauvegarde de données, redémarrez l'ordinateur sur votre DVD de "
 "Mageia et sélectionnez \"Système de secours\", puis restaurez le chargeur "
 "d'amorçage de Windows. Au prochain démarrage, vous aurez uniquement Windows "
 "sans aucun menu pour choisir votre système d'exploitation."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Pour récupérer l'espace utilisé par les partitions Mageia avec Windows, "
 "cliquez sur <code>Démarrer -> Panneau de configuration -> Outils "
@@ -5221,8 +5385,8 @@ msgstr ""
 "droit sur l'une des ces partitions et sélectionnez <guibutton>Supprimer</"
 "guibutton>. L'espace sera alors libéré."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5231,14 +5395,15 @@ msgstr ""
 "formater (en FAT32 ou en NTFS). Vous obtiendrez alors une lettre de "
 "partition."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Si vous disposez de Windows Vista ou Windows 7, vous avez une possibilité "
 "supplémentaire, vous pouvez étendre la partition existante à gauche de "
@@ -5292,3 +5457,338 @@ 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 ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Mot de passe (vérification) </guilabel>: inscrire à nouveau le "
+#~ "mot de passe ici et drakx vérifiera que le même mot de passe a bien été "
+#~ "saisi dans les deux champs."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "En complément, vous pouvez activer ou désactiver un compte invité."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Tout ce qu'un invité, possédant un compte invité par défaut "
+#~ "<emphasis>rbash</emphasis>, enregistre dans son répertoire /home sera "
+#~ "effacé lors de la déconnexion. Un invité peut enregistrer ses fichiers "
+#~ "importants sur une clé USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Activer le compte Invité </guilabel>: il est possible ici "
+#~ "d'activer ou de désactiver un compte Invité. Ce type de compte permet à "
+#~ "un invité de se connecter et d'utiliser le PC, mais avec des droits plus "
+#~ "restreints qu'un utilisateur ordinaire."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID du groupe </guilabel>: Indiquer ici l'ID du groupe.  Il "
+#~ "s'agit encore d'un nombre, généralement le même que l'ID de "
+#~ "l'utilisateur. Ne rien entrer ici si vous ne le connaissez pas."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Périphérique\", est composé de : \"type disque dur\", \"lettre d'ordre "
+#~ "du disque dur \", \"numéro de partition\" (exemple, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Poste de travail."
+
+#~ msgid "Server."
+#~ msgstr "Serveur."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Environnement graphique"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Il y a quatre groupes, cliquer sur le triangle devant chaque groupe pour "
+#~ "le déployer et voir tous les services qu'il contient."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Si vous ne trouvez pas votre carte dans la liste du fabricant, parce "
+#~ "qu'elle n'est pas encore répertoriée ou qu'elle est trop ancienne, vous "
+#~ "pouvez espérer trouver un pilote adapté dans la catégorie <emphasis>Xorg</"
+#~ "emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupX.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"configureX-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+#~ "configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id="
+#~ "\"configureX_monitor-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "There is a tab for every detected hard disk or other storage device, like "
+#~ "an USB key. For example sda, sdb and sdc if there are three of them."
+#~ msgstr ""
+#~ "Un onglet est présent pour chaque disque dur détecté et chaque autre "
+#~ "périphérique de stockage tel qu'une clé USB. Par exemple sda, sdb et sdc "
+#~ "s'ils sont trois."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "L'installeur partagera l'espace disponible selon les règles suivantes :"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Align to\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Free space preceding (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "A partir de cet écran, il est possible de paramétrer des préférences "
+#~ "personnelles :"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Sélectionner la langue en pressant la touche F2 (en mode Grub Legacy "
+#~ "uniquement). Il s'agit seulement de la langue pour l'installation (elle "
+#~ "peut être différente de la langue sélectionnée pour le système)."
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Voici par exemple l'écran d'accueil en Français si vous utilisez in DVD/"
+#~ "CD \"live\". Notez que le menu du DVD/CD \"live\" ne propose pas : le "
+#~ "<guilabel>système de secours</guilabel>, le <guilabel>test de mémoire</"
+#~ "guilabel> et <guilabel>l'outil de détection du matériel</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Ajouter certaines options du noyau en pressant la touche <emphasis role="
+#~ "\"bold\">F6</emphasis> en mode Grub Legacy ou la touche <emphasis role="
+#~ "\"bold\">e</emphasis> en mode UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Si l'installation échoue, il peut alors être nécessaire de réessayer en "
+#~ "utilisant l'une des options  spéciales. Le menu appelé par la touche F6 "
+#~ "affiche une nouvelle ligne appelée  <guilabel>Options de démarrage</"
+#~ "guilabel> et propose quatre entrées :"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Ajouter plus d'options du noyau en pressant la touche F1 (en mode Grub "
+#~ "Legacy uniquement)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Utilisation d'un réseau filaire"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Voici l'écran d'accueil par défaut si vous utilisez un CD d'installation "
+#~ "par le Réseau (les images netinstall.iso ou netinstall-nonfree.iso) :"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Cela ne permet pas de modifier la langue, les options disponibles sont "
+#~ "décrites dans l'écran. Pour plus d'information sur l'utilisation d'un CD "
+#~ "d'installation par le Réseau, consulter <link ns2:href=\"https://wiki."
+#~ "mageia.org/en/Boot.iso_install\">le Wiki Mageia</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Le clavier est Américain."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Si vous avez sélectionné \"Avec X\", il incluera également IceWM en tant "
+#~ "qu'environnement de bureau léger."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Choisir ici le niveau de sécurité souhaité."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "Laisser les valeurs par défaut si les choix à faire sont inconnus."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Media LIVE : vous pouvez démarrer les media avec un vrai système Mageia "
+#~ "sans l'installer, pour découvrir ce que vous obtiendrez après "
+#~ "installation. Le processus d'installation est plus simple, mais vous "
+#~ "aurez moins de choix."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Média de simple démarrage"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Cochez le bouton radio \"Sauvegarder un fichier\""
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Vous pouvez également utiliser l'outil dd dans une console :"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Débranchez votre clé USB, c'est terminé."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectinstallClass.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Choisir cette option pour une nouvelle installation de "
+#~ "<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."
+#~ msgstr ""
+#~ "Si vous disposez de plus d'une installation <application>Mageia</"
+#~ "application> sur votre ordinateur, l'installeur vous permettra de mettre "
+#~ "à niveau l'une d'entre elles avec la dernière version Mageia."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Guide"
diff --git a/docs/docs/stable/installer/hr.po b/docs/docs/stable/installer/hr.po
index 302958cf..7ec3c71b 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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/"
@@ -30,12 +30,13 @@ msgstr "Licenca i bilješka o izdanju"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -68,8 +69,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Za prihvaćanje jednostavno odaberite <guilabel>Prihvaćam</guilabel> i zatim "
@@ -92,22 +94,23 @@ msgstr "Bilješke o izdanju"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "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:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "hr"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Odabir Medija (Konfiguracija dopunskog instalacijskog medija)"
 
@@ -115,46 +118,50 @@ msgstr "Odabir Medija (Konfiguracija dopunskog instalacijskog medija)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "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:29
+#: en/add_supplemental_media.xml:24
 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:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of 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:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Odabir ogledala ili određenog URL (prvi unos). Odabirom ogledala imate "
 "pristup odabiru svih repozitorija uprave Mageia, poput Nonfree, sa Tainted "
@@ -162,14 +169,15 @@ msgstr ""
 "vlastitu NFS instalaciju."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "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 "
@@ -185,7 +193,7 @@ msgstr "Upravljanje korisnikom i superkorisnikom"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,21 +206,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Poostavi administratorsku (root) lozinku:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Preporučljivo je za sve <application>Mageia</application> instalacije "
 "postavit isuperkorisničku ili administrativnu lozinku, koju obično nazivamo "
@@ -223,32 +231,35 @@ msgstr ""
 "lozinku uspoređujući ih."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Unesite korisnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "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:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -257,7 +268,7 @@ msgstr ""
 "korisnika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -266,10 +277,11 @@ msgstr ""
 "polje."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Ime prijave</guilabel>: Ovdje unesite korisnikovo ie prijave ili "
@@ -277,40 +289,43 @@ msgstr ""
 "prijave je osjetljivo na mala i velika slova.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -319,74 +334,51 @@ msgstr ""
 "korisnicima</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Dozvole pristupa također se mogu promjeniti nakon instlacije."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Napredno korisničko upravljanje"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "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><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Dodatno, možete onemogućiti ili omogućiti račun gosta."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Omogući račun gosta</guilabel>: Ovdje možete omogućiti ili "
-"onemogućiti račun gosta. Račun gosta dopušta gostu prijavu i korištenje PC-"
-"ja, ali ima ograničeniji pristup od normalnih korisnika."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Odaberite mjesta montiranja"
 
@@ -403,13 +395,14 @@ msgstr "Odaberite mjesta montiranja"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -419,7 +412,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -430,41 +423,45 @@ msgstr ""
 "promjeniti točke montiranja."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "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:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "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:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Uređaj\" je napravljen od: \"tvrdi disk\", [\"broj tvrdog diska\"(slovo)], "
-"\"broj particijer\" (na primjer, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Ako imate puno particija, možete izabrati mnogo različitih točaka montiranja "
 "iz padajućeg izbornika, kao što su  <literal>/</literal>, <literal>/home</"
@@ -474,27 +471,29 @@ msgstr ""
 "literal> particiju cauldron instalacije."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Za particije kojima nemate pristup, možete ostaviti prazno polje točke "
 "montiranja."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "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:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -725,8 +724,9 @@ 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 "
+"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 "
@@ -735,7 +735,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -751,14 +751,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Odaberite želite li upotrebljavati <application>KDE</application> ili "
 "<application>Gnome</application> radno okruženje.Oba dolaze sa korisnim "
@@ -786,7 +788,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -794,62 +796,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Radna stanica"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis>Prilagođeno</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Poslužitelj"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafičko okruženje"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Odabir pojedinačnih paketa: Možete koristiti ovu opciju za ručno dodavanje "
 "ili uklanajnje paketa."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Pročitajte <xref linkend=\"minimal-install\"/> uputstva kako napraviti "
 "minimalnu instalaciju (sa ili bez X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Izaberi pojedinačne pakete"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Ovdje možete dodati ili ukloniti dodatne pakete za prilagodbu vaše "
 "instalacije."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -859,53 +868,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfigurirajte vaše servise"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
 "\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Ovdje možete postaviti koje servise (ne) pokrenuti kada podignete vaš sustav."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Postoje četiri grupe, kliknite na trokut ispred grupe za proširenje i vidite "
-"sve servise u grupi."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+msgid "The settings DrakX chose are usually good."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 
@@ -918,12 +925,13 @@ msgstr "Konfigurirajte vremensku zonu"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -933,18 +941,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Na slijedećem zaslonu moći ćete postaviti sat vašega sklopovlja na lokalno "
 "vrijeme ili na GMT, također poznat kao UTC."
@@ -959,117 +969,114 @@ msgstr ""
 "svi postavljeni na lokalno vrijeme ili na "
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "proizvođač"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "ime vaše kartice"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "vrsta kartice"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Bez obzira koje grafičko okruženje ( također poznato i kao desktop "
 "okruženje) izaberete za prvu instalaciju<application>Mageie</application>, "
@@ -1082,7 +1089,7 @@ msgstr ""
 "izbor neispravan."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1091,44 +1098,44 @@ msgstr ""
 "grafičku karticu sa liste ako je potrebno."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Razlučivost</guibutton></emphasis>: Ovdje postavite "
 "željenu razlučivost i dubinu boja."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1137,12 +1144,12 @@ msgstr ""
 "omogućavanje ili onemogućavanje raznih opcija."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Izaberite vaš monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1151,12 +1158,13 @@ msgstr ""
 "identificirati vaš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Odabirom monitora drugih karakteristika možete oštetiti vaš "
 "monitor i video sklopovlje. Molim ne pokušavajte tako nešto ukoliko ne znate "
@@ -1164,23 +1172,23 @@ msgstr ""
 "svoga monitora"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Prilagođeno</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1189,7 +1197,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1198,12 +1206,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1212,49 +1220,50 @@ msgstr ""
 "monitora."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Proizvođač</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "ime proizvođača monitora"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "opis monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generički</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Prilagođeno particioniranje diska pomoću DiskDrakea"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1262,75 +1271,80 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Pritisnite <guibutton>Očisti sve</guibutton> za brisanje svih particija na "
 "odabranom uređaju za pohranu"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Nastavite dok ne prilagodite sve sukladno svojim željama."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1338,19 +1352,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1363,27 +1377,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Particioniranje"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1392,43 +1406,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Koristi postojeće particije"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Koristi slobodni prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1436,7 +1450,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1447,40 +1461,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Izbriši i koristi cijeli disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Ova će opcija koristiti cijeli pogon za Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1488,86 +1509,95 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Proizvoljno particioniranje diska"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1575,38 +1605,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr ""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. type: Content of: <article><info><title>
@@ -1615,7 +1646,7 @@ msgid "Installation from LIVE medium"
 msgstr ""
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1630,17 +1661,17 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Službena dokumentacija za Mageiu"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1649,7 +1680,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1658,7 +1689,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1667,13 +1698,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1682,26 +1713,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalacija pomoću "
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Veljača 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1709,14 +1748,14 @@ msgstr "Čestitamo"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1726,26 +1765,26 @@ msgstr ""
 "i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Uživajte!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1759,31 +1798,31 @@ msgstr "Vatrozid"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1794,20 +1833,18 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1815,28 +1852,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatiram"
 
@@ -1845,60 +1882,64 @@ msgstr "Formatiram"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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:30
+#: en/formatPartitions.xml:24
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Uobičajeno je da barem particije koje je odabrao DrakX moraju biti "
 "formatirane."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia instalacijski program"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1906,261 +1947,232 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Instalacijski zaslon dobrodošlice"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+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><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
-msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+#. 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><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2170,17 +2182,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2188,22 +2200,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2213,32 +2227,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2251,32 +2266,36 @@ msgstr "Nadogradnje"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
-msgstr ""
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
+msgstr "Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni."
 
 #. type: Content of: <section><info><title>
 #: en/login.xml:1
@@ -2327,15 +2346,18 @@ msgstr ""
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2344,14 +2366,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2361,61 +2383,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2425,12 +2447,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2447,17 +2472,17 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2472,199 +2497,199 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2672,48 +2697,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sigurnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2721,7 +2746,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -2775,36 +2800,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Sigurnosna Razina"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis>Proizvođač</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2821,222 +2881,223 @@ msgstr "Uvod"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+msgid "Different media for 32 and 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+msgid "All available languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
+#: en/SelectAndUseISOs2.xml:139
+msgid "Net install media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+msgid "First steps are English language only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3068,9 +3129,9 @@ msgstr ""
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3081,9 +3142,9 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3093,7 +3154,7 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3102,197 +3163,209 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
+"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:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3316,39 +3389,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+msgid ""
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3376,108 +3457,114 @@ msgstr ""
 #: en/selectCountry.xml:19
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instaliraj"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: 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 you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3505,26 +3592,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3535,37 +3625,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Molim izaberite jezik koji želite koristiti"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3573,23 +3663,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3598,35 +3688,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3670,63 +3760,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3735,25 +3825,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3762,50 +3854,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3814,35 +3907,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3851,140 +3944,139 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opcije"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
+"<guilabel>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:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr ""
 
@@ -3997,29 +4089,32 @@ msgstr ""
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
@@ -4040,8 +4135,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4057,33 +4151,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Napredno"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4094,27 +4190,33 @@ msgstr ""
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
-msgstr ""
+msgstr "Kliknite na <guibutton>Učinjeno</guibutton> kada ste spremni."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4223,54 +4325,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4311,3 +4408,63 @@ 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 ""
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Dodatno, možete onemogućiti ili omogućiti račun gosta."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Omogući račun gosta</guilabel>: Ovdje možete omogućiti ili "
+#~ "onemogućiti račun gosta. Račun gosta dopušta gostu prijavu i korištenje "
+#~ "PC-ja, ali ima ograničeniji pristup od normalnih korisnika."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Uređaj\" je napravljen od: \"tvrdi disk\", [\"broj tvrdog diska"
+#~ "\"(slovo)], \"broj particijer\" (na primjer, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Radna stanica"
+
+#~ msgid "Server."
+#~ msgstr "Poslužitelj"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafičko okruženje"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Postoje četiri grupe, kliknite na trokut ispred grupe za proširenje i "
+#~ "vidite sve servise u grupi."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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 4569f9bd..22f9a98c 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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/"
@@ -40,12 +40,13 @@ msgstr "Licenc és kiadási megjegyzések"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -76,8 +77,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Az elfogadáshoz válassza az <guilabel>elfogadom</guilabel> lehetőséget és "
@@ -99,22 +101,23 @@ msgstr "Kiadási megjegyzések"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "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:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "hu"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Média kiválasztás (Kiegészítő media csomagok telepítése és konfigurálása)"
@@ -123,23 +126,25 @@ msgstr ""
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "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 "
@@ -147,23 +152,25 @@ msgstr ""
 "milyen csomagok állnak a rendelkezésére."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "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:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of 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:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "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 "
@@ -172,14 +179,15 @@ msgstr ""
 "saját NFS -t telepíthetünk."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "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, "
@@ -194,7 +202,7 @@ msgstr "Felhasználó és rendszergazda útmutató."
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -207,21 +215,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "A rendszergazdai (root) jelszó beállítása"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Fontos, hogy a <application>Mageiánkba</application>magasabb szintű  "
 "felhasználó vagy egy rendszergazda legyen. A Mageiában telepítéskor "
@@ -232,25 +240,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:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Adjon meg egy felhasználót"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "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 "
@@ -258,7 +269,7 @@ 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:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -267,17 +278,18 @@ msgstr ""
 "ikonja megváltozik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
 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:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Bejelentkezési név</guilabel>: Itt adja meg a felhasználói "
@@ -286,40 +298,43 @@ msgstr ""
 "érzékeny.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>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:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -328,89 +343,60 @@ msgstr ""
 "Felhasználó kezelés </emphasis> lehetőséget."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "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:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Speciális Felhasználókezelés"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "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><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Ezenkívül letilthatja vagy engedélyezheti a vendégfiókot."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Bármit, amire a vendég az alapértelmezett <emphasis> rbash </emphasis> "
-"vendégfiókkal elmentheti a saját könyvtárát, és akkor törlődik, amikor ki "
-"jelentkezik. A vendégnek  a fontos fájlokat  le kell mentenie egy USB-s "
-"kulcsra."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel> Vendégfiók engedélyezése </guilabel>: Itt engedélyezheti vagy "
-"letilthatja a vendégfiókot.A vendégfióknak köszönhetően a vendég "
-"bejelentkezhet és használhatja a számítógépet, de korlátozottabb "
-"hozzáféréssel rendelkezik, mint a normál felhasználók."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>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:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>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:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Csoport azonosító</guilabel>:Ezzel beállíthatja a csoport "
-"azonosítóját.Szintén egy szám, általában ugyanaz, mint a felhasználó száma."
-"Hagyja üresen, hacsak nem tudja, mit csinál."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Válassza ki a csatolási pontokat"
 
@@ -427,13 +413,14 @@ msgstr "Válassza ki a csatolási pontokat"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -443,7 +430,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -454,58 +441,60 @@ msgstr ""
 "csatolási pontokat."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"Az \"eszköz\" a következőket tartalmazza: [\"merevlemez\", \"merevlemez-szám"
-"\" (betű)], \"partíciószám\" (például \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "A partíciókhoz, amelyekhez nem kell hozzáférnie, a csatolási pont mezőt "
 "üresen hagyhatja."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -748,14 +737,14 @@ 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 "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -772,13 +761,14 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -799,7 +789,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -807,24 +797,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Munkaállomás."
+#, 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
-msgid "Server."
-msgstr "Kiszolgáló."
+#, 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
-msgid "Graphical Environment."
-msgstr "Grafikus környezet"
+#, 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
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Egyedi csomag választás: kézzel kiválaszthatja a telepítendő vagy "
 "eltávolítandó csomagokat."
@@ -832,33 +826,34 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -868,50 +863,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 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 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+msgid "The settings DrakX chose are usually good."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 
@@ -924,12 +917,13 @@ msgstr "Időzóna beállítása"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -940,15 +934,15 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -959,121 +953,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "gyártó"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "és a kártya típusa"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1082,86 +1071,88 @@ msgstr ""
 "válassza ki a kártyát a listából."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
+"<emphasis><guibutton>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:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Monitor kiválasztása"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Egyéni</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1170,7 +1161,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1179,61 +1170,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Gyártó</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "a monitor gyártó neve"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "a monitor leírása"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Általános</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 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:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1244,70 +1236,72 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1315,19 +1309,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1340,27 +1334,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partícionálás"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1373,43 +1367,43 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Létező partíciók használata"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Szabad hely használata"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Szabad hely használata a Windows Partíción"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1417,7 +1411,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1428,44 +1422,46 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Az egész lemez törlése és használata."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+msgid "This option will allocate the entire drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1473,86 +1469,95 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Egyéni lemezpartícionálás"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1563,7 +1568,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1572,31 +1577,33 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr ""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr ""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. type: Content of: <article><info><title>
@@ -1605,7 +1612,7 @@ 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:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1620,17 +1627,17 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia Hivatalos dokumentáció"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1642,7 +1649,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1654,7 +1661,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1666,13 +1673,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1684,26 +1691,33 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Telepítés a DarkX használatával"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "2014 Február"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1711,7 +1725,7 @@ msgstr "Gratulálunk"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1720,7 +1734,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1728,26 +1742,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1761,31 +1775,31 @@ msgstr "Tűzfal"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1796,20 +1810,18 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1817,28 +1829,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr ""
 
@@ -1847,14 +1859,14 @@ msgstr ""
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1864,47 +1876,47 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, a Mageia telepítő"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1912,267 +1924,237 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+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><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
-msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+#. 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><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Vezetékes hálózat használata"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Telepítési lépések"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2182,17 +2164,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Nincs grafikus felület"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2200,22 +2182,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "A telepítés lefagy"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2225,32 +2209,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM hiba"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dinamikus partíciók"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2263,34 +2248,34 @@ msgstr "Frissítések"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2342,18 +2327,18 @@ msgstr "Média kiválasztása (Zárt csomagok)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2362,14 +2347,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2379,61 +2364,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimális telepítő"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2443,15 +2428,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2469,17 +2454,17 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2494,161 +2479,161 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Rendszer paraméterek"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Időzóna</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Ország / Régió</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: 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:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Felhasználókezelő</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Szolgálatások</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Billentyűzet</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Egér</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Hangkártya</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2657,38 +2642,38 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Hálózat</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2696,48 +2681,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Biztonság"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Biztonsági szint</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tűzfal</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2745,7 +2730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -2803,39 +2788,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partíció méret:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#, 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
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2852,222 +2870,226 @@ msgstr "Bevezetés"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klasszikus telepítőmédia"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+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:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Élő lemezkép"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Élő Plasma DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+msgid "All available languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Csak 64 bites architektúra"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Élő GNOME DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Csak GNOME ablakkezelő."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Élő Xfce DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Csak Xfce ablakkezelő."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 vagy 64 bites architektúrák."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr ""
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Csak Angol nyelv."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3099,9 +3121,9 @@ msgstr "Letöltés"
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3112,9 +3134,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3124,7 +3146,7 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3133,197 +3155,209 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
+"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:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3347,39 +3381,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+msgid ""
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3409,110 +3451,114 @@ msgstr ""
 #: en/selectCountry.xml:19
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Beviteli mód"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Telepítés vagy Frissítés"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Telepítés"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Frissítés"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: 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 you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3540,28 +3586,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3572,37 +3619,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Válasszon nyelvet"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3610,23 +3657,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3639,35 +3686,35 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3713,63 +3760,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Rendszerindítási beállítások"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3782,25 +3829,27 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3813,50 +3862,51 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3869,35 +3919,35 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3910,14 +3960,14 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -3926,126 +3976,125 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Beállítások"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Előző oldal"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
+"<guilabel>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:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Következő oldal"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI beállítás"
 
@@ -4058,31 +4107,32 @@ msgstr "SCSI beállítás"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
@@ -4105,8 +4155,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4122,33 +4171,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Speciális"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
@@ -4159,13 +4210,13 @@ msgstr ""
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4176,15 +4227,16 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4293,54 +4345,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia eltávolítás"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Hogyan"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4387,3 +4434,172 @@ msgid ""
 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 "Additionally, you can disable or enable a guest account."
+#~ msgstr "Ezenkívül letilthatja vagy engedélyezheti a vendégfiókot."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Bármit, amire a vendég az alapértelmezett <emphasis> rbash </emphasis> "
+#~ "vendégfiókkal elmentheti a saját könyvtárát, és akkor törlődik, amikor ki "
+#~ "jelentkezik. A vendégnek  a fontos fájlokat  le kell mentenie egy USB-s "
+#~ "kulcsra."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel> Vendégfiók engedélyezése </guilabel>: Itt engedélyezheti vagy "
+#~ "letilthatja a vendégfiókot.A vendégfióknak köszönhetően a vendég "
+#~ "bejelentkezhet és használhatja a számítógépet, de korlátozottabb "
+#~ "hozzáféréssel rendelkezik, mint a normál felhasználók."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Csoport azonosító</guilabel>:Ezzel beállíthatja a csoport "
+#~ "azonosítóját.Szintén egy szám, általában ugyanaz, mint a felhasználó "
+#~ "száma.Hagyja üresen, hacsak nem tudja, mit csinál."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "Az \"eszköz\" a következőket tartalmazza: [\"merevlemez\", \"merevlemez-"
+#~ "szám\" (betű)], \"partíciószám\" (például \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Munkaállomás."
+
+#~ msgid "Server."
+#~ msgstr "Kiszolgáló."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafikus környezet"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Vezetékes hálózat használata"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Hogyan"
diff --git a/docs/docs/stable/installer/id.po b/docs/docs/stable/installer/id.po
index 52849d55..2bde966d 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: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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/"
@@ -29,13 +29,20 @@ msgstr "Lisensi dan Catatan Rilis"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
-msgstr ""
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata 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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:40
@@ -62,8 +69,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Untuk menerima, pilih <guilabel>Terima</guilabel> lalu klik "
@@ -86,22 +94,23 @@ msgstr "Catatan Rilis"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "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:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "id"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Pemilihan Media (Konfigurasi Media Instalasi Pelengkap)"
 
@@ -109,23 +118,25 @@ msgstr "Pemilihan Media (Konfigurasi Media Instalasi Pelengkap)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Layar ini memberi Anda daftar repositori yang telah dikenali. Anda bisa "
 "menambahkan sumber lain, seperti disk optik atau sumber remote. Pemilihan "
@@ -133,23 +144,25 @@ msgstr ""
 "langkah-langkah berikutnya."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Untuk sumber jaringan, ada dua langkah yang harus diikuti:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Memilih dan mengaktifkan jaringan, jika belum terhubung."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Memilih mirror atau menentukan URL (entri paling awal). Dengan memilih "
 "mirror,  Anda memiliki akses ke semua repositori terpilih yang dikelola oleh "
@@ -157,14 +170,15 @@ msgstr ""
 "bisa menentukan repositori tertentu atau instalasi NFS Anda."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Jika Anda mengupdate instalasi 64 bit yang mungkin berisi beberapa paket 32 "
 "bit, maka disarankan untuk menggunakan layar ini untuk menambahkan mirror "
@@ -180,7 +194,7 @@ msgstr "Pengelolaan Pengguna dan Pengguna Super"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -194,21 +208,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Atur Sandi Administrator (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Disarankan untuk semua instalasi <application>Mageia</application> agar "
 "mengatur sandi superuser atau administrator, biasanya di Linux disebut "
@@ -220,25 +234,28 @@ msgstr ""
 "sandi pada sandi pertama dengan membandingkannya."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Masukkan pengguna"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Tambahkan pengguna di sini. Pengguna memiliki hak yang lebih sedikit "
 "dibanding superuser (root), tapi cukup untuk menjelajah internet, "
@@ -246,7 +263,7 @@ msgstr ""
 "biasa dilakukan pengguna dengan komputernya"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -255,7 +272,7 @@ msgstr ""
 "ikon pengguna."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -264,10 +281,11 @@ msgstr ""
 "ini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Nama Login</guilabel>: Di sini Anda memasukkan nama login pengguna "
@@ -275,42 +293,43 @@ msgstr ""
 "login berlaku sensitif.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>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:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>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:61
+#: en/addUser.xml:79
 #, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "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:63
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -320,70 +339,46 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Perizinan hak akses juga bisa diubah setelah instalasi."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Pengelolaan Pengguna Lanjutan"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Jika tombol <guibutton>lanjutan</guibutton> diklik, akan ditampilkan sebuah "
 "layar yang memungkinkan Anda mengedit pengaturan pengguna yang Anda "
 "tambahkan."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Apapun yang disimpan oleh akun tamu dengan <emphasis>rbash</emphasis> bawaan "
-"yang disimpan di direktori /home akan dihapus saat dia keluar.  Tamu harus "
-"menyimpan file pentingnya ke dalam flashdisk."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Hidupkan akun tamu</guilabel>: Di sini Anda bisa menghidupkan atau "
-"mematikan akun tamu. Akun tamu memungkinkan tamu masuk dan menggunakan "
-"komputer, tapi dia memiliki akses yang lebih terbatas daripada pengguna "
-"normal."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: 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:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID pengguna</guilabel>: Di sini Anda bisa mengatur ID untuk "
 "pengguna yang Anda tambahkan pada layar sebelumnya. Ini adalah nomor.  "
@@ -391,18 +386,14 @@ msgstr ""
 "sini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID grup</guilabel>: Ini untuk mengatur ID grup.  Nomor juga, "
-"biasanya sama dengan pengguna. Biarkan kosong kecuali jika Anda mengetahui "
-"apa yang harus diisikan di sini."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Pilih titik kait"
 
@@ -419,13 +410,14 @@ msgstr "Pilih titik kait"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -435,7 +427,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -446,41 +438,45 @@ msgstr ""
 "mengubah titik kaitnya."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Jika Anda mengubah apapun, pastikan Anda tetap memiliki partisi <literal>/</"
 "literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Setiap partisi ditampilkan sebagai berikut: \"Perangkat\" (\"Kapasitas\", "
 "\"Titik kait\", \"Tipe\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Perangkat\", terdiri dari: \"harddisk\", [\"nomor harddisk\"(huruf)], "
-"\"nomor partisi\" (contohnya, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Jika Anda memiliki banyak partisi, Anda bisa memilih banyak titik kait yang "
 "berbeda dari menu drop down, seperti <literal>/</literal>, <literal>/home</"
@@ -490,27 +486,29 @@ msgstr ""
 "<literal>/home</literal> instalasi cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Untuk partisi yang tidak akan Anda akses, Anda bisa membiarkan kolom titik "
 "kait kosong."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "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:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -733,8 +731,9 @@ 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 "
+"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 "
@@ -742,8 +741,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -763,14 +763,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Pilih apakah Anda lebih suka menggunakan lingkungan desktop "
 "<application>KDE</application> atau <application>Gnome</application>. "
@@ -799,8 +801,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -812,24 +815,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Lingkungan kerja."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Lingkungan Grafis"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Pemilihan Paket Individu: Anda bisa menggunakan pilihan ini untuk menambah "
 "atau menghapus paket secara manual."
@@ -837,35 +844,37 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Pilih Paket Individual"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Di sini Anda bisa menambah atau menghapus paket tambahan apapun untuk "
 "menyesuaikan instalasi."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -880,47 +889,45 @@ msgstr ""
 "instalasi dan memuatnya."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfigurasikan Layanan Anda"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Di sini Anda bisa mengatur layanan mana yang (tidak) harus dijalankan saat "
 "komputer dinyalakan."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Ada empat grup, klik pada segitiga sebelum grup untuk membentangkan dan "
-"melihat layanan yang ada di dalamnya."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Pengaturan pilihan DrakX biasanya sudah bagus."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -929,7 +936,7 @@ msgstr ""
 "dalam kotak informasi di bawah."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
 
@@ -942,12 +949,13 @@ msgstr "Konfigurasi Zona Waktu Anda"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -957,18 +965,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Pada layar berikutnya Anda bisa memilih untuk mengatur jam hardware Anda ke "
 "waktu lokal atau GMT, atau disebut juga UTC."
@@ -983,23 +993,24 @@ msgstr ""
 "semua diatur ke waktu lokal, atau semua ke UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Pilih Server X (Konfigurasi Perangkat Grafis Anda)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1008,7 +1019,7 @@ msgstr ""
 "mengidentifikasi perangkat video Anda dengan benar."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1017,101 +1028,98 @@ msgstr ""
 "mengetahui mana yang Anda punya, Anda bisa memilihnya dari pohon dengan:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "pabrikan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "lalu nama perangkat"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "dan tipe perangkat"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Jika tidak menemukan perangkat Anda di daftar pabrikan (karena belum masuk "
-"basis data atau perangkat lawas) Anda mungkin bisa menemukan driver yang "
-"cocok di kategori Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "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:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "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:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "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:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Apapun lingkungan grafis (disebut juga lingkungan desktop) yang Anda pilih "
 "dalam menginstall <application>Mageia</application>, semua bersandar pada "
@@ -1123,7 +1131,7 @@ msgstr ""
 "membuat pilihan, atau jika pilihan salah."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1132,13 +1140,14 @@ msgstr ""
 "perangkat Anda dari daftar berikut jika diperlukan."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Anda bisa memilih "
 "<guilabel>Plug'n Play</guilabel> jika bisa diterapkan, atau pilih monitor "
@@ -1147,30 +1156,31 @@ msgstr ""
 "refresh rate monitor horisontal dan vertikal secara manual."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Refresh rate yang tidak tepat bisa merusak monitor Anda"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Resolusi</guibutton></emphasis>: Atur resolusi dan "
 "kedalaman warna monitor yang diinginkan di sini."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Coba</guibutton></emphasis>: Tombol untuk mencoba tidak "
 "selalu muncul saat instalasi. Jika tombolnya ada, Anda bisa mengendalikan "
@@ -1182,7 +1192,7 @@ msgstr ""
 "tersedia</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1191,12 +1201,12 @@ msgstr ""
 "memilih untuk menghidupkan atau mematikan berbagai pilihan."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Pemilihan Monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1205,12 +1215,13 @@ msgstr ""
 "monitor Anda dengan tepat."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Memilih monitor dengan karakteristik yang berbeda bisa merusak "
 "monitor atau perangkat video Anda. Jangan mencoba sesuatu jika Anda tidak "
@@ -1218,23 +1229,23 @@ msgstr ""
 "monitor yang Anda miliki"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Sesuaian</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1247,7 +1258,7 @@ msgstr ""
 "line ditampilkan."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1260,12 +1271,12 @@ msgstr ""
 "miliki."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1274,12 +1285,12 @@ msgstr ""
 "basis data."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1289,28 +1300,30 @@ msgstr ""
 "dengan memilih:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "nama pembuat monitor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "keterangan monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Umum</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "memilih grup ini menampilkan hampir 30 konfigurasi seperti 1024x768 @ 60 Hz "
 "dan termasuk layar datar seperti yang digunakan pada laptop. Ini seringkali "
@@ -1319,12 +1332,12 @@ msgstr ""
 "sangat bijaksana jika Anda memilih yang sederhana."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1336,12 +1349,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Jika ingin menggunakan enkripsi untuk partisi <literal>/</literal> Anda, "
 "pastikan Anda memiliki partisi <literal>/boot</literal> terpisah. Pilihan "
@@ -1349,87 +1364,88 @@ msgstr ""
 "Anda tidak akan bisa berjalan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"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:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Tekan <guibutton>Bersihkan semua</guibutton> untuk membersihkan semua "
 "partisi pada perangkat penyimpanan terpilih"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Lanjutkan hingga Anda mengatur semua yang Anda inginkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 #, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1439,7 +1455,7 @@ msgstr ""
 "Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1452,32 +1468,34 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Pemartisian"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "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:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "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:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1490,12 +1508,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Gunakan Partisi yang Tersedia"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1504,12 +1522,12 @@ msgstr ""
 "ditemukan dan mungkin bisa digunakan untuk instalasi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Gunakan Ruang Kosong"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1518,12 +1536,12 @@ msgstr ""
 "ini akan menggunakannya untuk menginstall Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Gunakan Ruang Kosong pada Partisi Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1532,7 +1550,7 @@ msgstr ""
 "installer akan menawarkan untuk menggunakannya."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1542,7 +1560,7 @@ msgstr ""
 "beresiko sehingga Anda harus membuat cadangan file penting Anda!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1558,12 +1576,14 @@ msgstr ""
 "Sangat disarankan untuk membuat cadangan semua file pribadi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Dengan opsi ini, installer menampilkan partisi Windows yang tersisa dalam "
 "warna biru cerah dan partisi Mageia nantinya dalam warna biru gelap dengan "
@@ -1572,37 +1592,38 @@ msgstr ""
 "kedua partisi. Lihat gambar di bawah."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Hapus dan gunakan Seluruh Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Pilihan ini akan menggunakan seluruh perangkat untuk Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang dipilih. Hati-"
 "hati!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1613,13 +1634,13 @@ msgstr ""
 "gunakan pilihan ini."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1627,74 +1648,83 @@ msgstr ""
 "Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1706,7 +1736,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1716,15 +1746,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Beberapa perangkat baru sekarang menggunakan sektor logis 4096 bit, daripada "
 "standar sebelumnya 512 bit. Karena keterbatasan hardware, alat pemartisian "
@@ -1735,19 +1766,22 @@ msgstr ""
 "berikut:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Selaraskan ke\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Ruang kosong di awal (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis>Pabrikan</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
 
 #. type: Content of: <article><info><title>
@@ -1756,7 +1790,7 @@ msgid "Installation from LIVE medium"
 msgstr ""
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1771,18 +1805,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Dokumentasi Resmi Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1794,7 +1828,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1806,7 +1840,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1818,13 +1852,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1836,26 +1870,34 @@ msgstr ""
 "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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalasi dengan DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februari 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1863,7 +1905,7 @@ msgstr "Selamat"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1874,7 +1916,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1885,16 +1927,17 @@ msgstr ""
 "menjalankan ulang komputer."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "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:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1903,12 +1946,12 @@ msgstr ""
 "otomatis terpilih dan dijalankan."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Nikmatilah!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1924,31 +1967,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1960,21 +2003,19 @@ msgstr "<emphasis>Pabrikan</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Umum</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1982,28 +2023,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Pemformatan"
 
@@ -2012,39 +2053,40 @@ msgstr "Pemformatan"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Di sini Anda bisa memilih partisi mana yang ingin Anda format. Semua data "
 "pada partisi yang <emphasis>tidak</emphasis> ditandai untuk diformat akan "
 "tetap tersimpan."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr "Biasanya, setidaknya partisi yang dipilih oleh DrakX perlu diformat"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2053,12 +2095,13 @@ msgstr ""
 "Anda periksa dari yang disebut <emphasis>blok rusak</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Jika Anda tidak yakin telah membuat pilihan yang benar, Anda bisa mengklik "
 "<guibutton>Sebelumnya</guibutton>, lalu <guibutton>Sebelumnya</guibutton> "
@@ -2067,7 +2110,7 @@ msgstr ""
 "partisi Anda."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2076,12 +2119,12 @@ msgstr ""
 "guibutton> untuk melanjutkan."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Installer Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2092,7 +2135,7 @@ msgstr ""
 "mungkin."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2101,65 +2144,74 @@ msgstr ""
 "memulai installer, yang normalnya adalah yang Anda inginkan."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Layar Selamat Datang untuk Instalasi"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Ini adalah layar sambutan baku ketika menggunakan DVD Mageia, yang pertama "
 "dengan sistem legacy dan yang kedua dengan sistem UEFI:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"Dari layar awal ini dimungkinkan untuk mengatur beberapa pengaturan pribadi:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Bahasa (untuk instalasi saja, mungkin berbeda dengan bahasa yang dipilih "
-"untuk sistem) dengan menekan tombol F2 (hanya mode Legacy)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2168,38 +2220,23 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, 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."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Seperti ini contohnya, layar sambutan bahasa Perancis ketika menggunakan "
-"Live DVD/CD. Ingat bahwa menu Live DVD/CD tidak disodorkan: <guilabel>Sistem "
-"Penyelamat</guilabel>, <guilabel>Pengujian memori</guilabel> dan "
-"<guilabel>Peralatan Pendeteksian Perangkat Keras</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+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><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2208,52 +2245,53 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Tambahkan beberapa opsi kernel dengan menekan tombol <emphasis role=\"bold"
-"\">F6</emphasis> untuk mode legacy atau tombol <emphasis role=\"bold\">e</"
-"emphasis> untuk mode UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- 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 ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Jika instalasi gagal, mungkin penting untuk mencoba kembali menggunakan "
-"salah satu opsi tambahan. Menu yang dipanggil dengan F6 menampilkan baris "
-"baru yang disebut <guilabel>Opsi boot</guilabel> dan menawarkan empat entri:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Baku, dia tidak mengubah apapun dalam opsi baku."
+"- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
+"kinerja."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Tanpa ACPI (Advanced Configuration and Power Interface), manajemen daya "
 "tidak diterapkan."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Tanpa APIC Lokal (Local Advanced Programmable Interrupt Controller), ini "
 "untuk interupsi CPU, pilih opsi ini jika diminta."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2262,18 +2300,19 @@ msgstr ""
 "ditampilkan pada <guilabel>Opsi Boot</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Pada beberapa rilis Mageia, mungkin entri yang dipilih dengan tombol F6 "
 "tidak muncul pada baris <guilabel>Opsi Boot</guilabel>, tetapi, sebenarnya "
 "mereka telah diterapkan."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2282,26 +2321,20 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Tambahkan lebih banyak opsi kernel dengan menekan tombol F1 (hanya mode "
-"Legacy)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 #, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "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."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2310,12 +2343,13 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Tampilan detil tentang pilihan splash. Tekan Esc atau pilih "
 "<guilabel>Kembali ke Opsi Boot</guilabel> untuk kembali ke daftar pilihan. "
@@ -2323,7 +2357,7 @@ msgstr ""
 "guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2332,12 +2366,15 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2348,83 +2385,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-#, fuzzy
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Ini adalah layar sambutan baku ketika menggunakan CD Instalasi Jaringan "
-"Kabel (image Boot.iso atau Boot-Nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Ini tidak memungkinkan untuk mengubah bahasa, pilihan yang tersedia "
-"dijelaskan pada layar. Untuk informasi tentang menggunakan CD Instalasi "
-"Jaringan Kabel, lihat <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">Wiki Mageia</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Layout keyboard adalah layout Amerika."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Langkah-langkah instalasi"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Proses instalasi terbagi ke dalam beberapa langkah, yang bisa diikuti pada "
 "panel samping dari layar."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "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><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "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:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2443,17 +2445,17 @@ msgstr ""
 "bersamaan untuk menjalankan ulang."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Tidak Ada Antarmuka Grafis"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2465,13 +2467,16 @@ msgstr ""
 "pada baris perintah."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Jika perangkat keras sudah tua, instalasi grafis mungkin tidak bisa. Jika "
 "demikian, akan lebih baik untuk mencoba instalasi dengan mode teks. Untuk "
@@ -2480,12 +2485,12 @@ msgstr ""
 "\"text\" lalu tekan ENTER. Lalu lanjutkan dengan instalasi dalam mode teks."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instalasi Membeku"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2500,14 +2505,15 @@ msgstr ""
 "pilihan lain seperlunya."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Masalah RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2518,18 +2524,20 @@ msgstr ""
 "yang benar. Misalnya <code>mem=256M</code> untuk menentukan RAM 256MB."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Partisi dinamis"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Jika Anda mengubah harddisk dari format \"basic\" ke format \"dynamic\" pada "
 "Microsoft Windows, Anda harus tahu bahwa tidak mungkin menginstall Mageia "
@@ -2547,18 +2555,19 @@ msgstr "Update"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2567,10 +2576,11 @@ msgstr ""
 "paket akan terus diupdate atau ditingkatkan."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Pilih <guilabel>ya</guilabel> jika Anda ingin mendownload dan "
@@ -2578,8 +2588,9 @@ msgstr ""
 "melakukannya sekarang, atau jika Anda tidak terhubung ke internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Lalu tekan <guibutton>Selanjutnya</guibutton> untuk melanjutkan"
 
 #. type: Content of: <section><info><title>
@@ -2633,18 +2644,19 @@ msgstr "Pemilihan Media (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2657,7 +2669,7 @@ msgstr ""
 "tersedia untuk dipilih pada langkah selanjutnya."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2666,7 +2678,7 @@ msgstr ""
 "dasar dari distribusi."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2681,13 +2693,14 @@ msgstr ""
 "firmware untuk berbagai perangkat WiFi, dsb."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Repository <emphasis>Tainted</emphasis> menyertakan paket-paket yang "
 "dikeluarkan di bawah lisensi bebas. Kriteria utama menempatkan paket-paket "
@@ -2697,55 +2710,57 @@ msgstr ""
 "diperlukan untuk memainkan video DVD komersial, dsb."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalasi Minimal"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "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:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "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:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2755,15 +2770,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2780,11 +2796,12 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX membuat pilihan pintar untuk konfigurasi sistem Anda tergantung pada "
 "pilihan yang telah Anda buat dan pada hardware yang terdeteksi oleh DrakX. "
@@ -2794,8 +2811,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2810,73 +2827,75 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parameter sistem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zona Waktu</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX 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:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Negara / Wilayah</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Jika Anda tidak berada pada negara terpilih, sangat penting untuk "
 "memperbaiki pengaturan. Lihat <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX telah membuat pilihan yang bagus untuk pengaturan bootloader."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 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:69
+#: 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:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Pengelolaan pengguna</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2885,22 +2904,23 @@ msgstr ""
 "direktori <literal>/home</literal> masing-masing."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Layanan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Layanan sistem yang mengacu pada program kecil yang berjalan di belakang "
 "layar (daemon). Alat ini memungkinkan Anda untuk menghidupkan atau mematikan "
 "tugas-tugas tertentu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2909,43 +2929,44 @@ msgstr ""
 "sebuah kesalahan bisa menghalangi komputer untuk berjalan dengan semestinya."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Untuk informasi lebih, lihat <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parameter hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Keyboard</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Ini adalah tempat Anda bisa mengatur atau mengubah layout keyboard yang akan "
 "tergantung pada lokasi, bahasa atau tipe keyboard Anda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2954,39 +2975,40 @@ msgstr ""
 "tablet, trackball, dsb."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Perangkat suara</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "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:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Antarmuka grafis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Bagian ini memungkinkan Anda mengkonfigurasi perangkat grafis dan tampilan."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Untuk informasi lebih, lebih <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -2997,20 +3019,21 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parameter Jaringan dan Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Jaringan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3020,21 +3043,22 @@ msgstr ""
 "Anda belum menghidupkan reporitory media Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Jika Anda menambahkan perangkat jaringan, jangan lupa untuk mengatur "
 "firewall untuk melihat antarmuka jaringan tersebut."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3045,26 +3069,27 @@ msgstr ""
 "komputer untuk memanfaatkan layanan proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "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:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Keamanan"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Tingkat Keamanan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3073,17 +3098,17 @@ msgstr ""
 "(Standar) adalah yang paling memadai untuk penggunaan umum."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Lihat pilihan yang sesuai dengan penggunaan komputer Anda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3092,7 +3117,7 @@ msgstr ""
 "para penjahat di internet yang bermaksud untuk membahayakan atau mencurinya."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 #, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
@@ -3103,7 +3128,7 @@ msgstr ""
 "tergantung pada komputer Anda akan digunakan untuk apa."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "Ingat bahwa membiarkan semua (tanpa firewall) akan sangat beresiko."
 
@@ -3167,41 +3192,74 @@ msgstr ""
 "menginstall <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Tingkat Keamanan"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Anda bisa mengatur penyesuaian tingkat keamanan di sini."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Biarkan tetap pada pengaturan bawaan jika Anda tidak mengerti apa yang harus "
-"dipilih."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Setelah instalasi, mengatur penyesuaian keamanan tetap bisa dilakukan di "
 "bagian <guilabel>Keamanan</guilabel> pada Pusat Kendali Mageia."
@@ -3220,96 +3278,102 @@ msgstr "Pengantar"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definisi"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "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:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Anda bisa menemukannya <link ns4:href=\"http://www.mageia.org/id/downloads/"
 "\">di sini</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Media instalasi klasik"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Fitur umum"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "ISO ini menggunakan installer tradisional yang disebut drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr "Mereka bisa membuat instalasi baru atau update dari rilis sebelumnya."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Media berbeda untuk arsitektur 32 atau 64 bit."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3318,118 +3382,123 @@ msgstr ""
 "Pengujian Memori, Peralatan Pendeteksi Perangkat Keras."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Setiap DVD berisi banyak lingkungan desktop dan bahasa yang tersedia."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Anda akan diberikan untuk memilih perangkat lunak non free saat instalasi."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Media live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "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:80
+#: 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)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">ISO Live hanya bisa digunakan untuk membuat "
 "instalasi baru, mereka tidak bisa digunakan untuk upgrade dari rilis "
 "sebelumnya.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Mereka berisi perangkat lunak non free."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 #, fuzzy
 msgid "Plasma desktop environment only."
 msgstr "Hanya lingkungan desktop KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Menyediakan semua bahasa."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Hanya lingkungan desktop GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 #, fuzzy
 msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 #, fuzzy
 msgid "Xfce desktop environment only."
 msgstr "Hanya lingkungan desktop KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 #, fuzzy
 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:140
-msgid "Boot-only CD media"
-msgstr "Media CD hanya-boot"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Media instalasi klasik"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3441,28 +3510,30 @@ msgstr ""
 "drive lokal, jaringan lokal atau Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Hanya bahasa Inggris."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
@@ -3501,9 +3572,9 @@ msgstr "Mengunduh"
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Setelah Anda memilih berkas ISO, Anda bisa mengunduhnya menggunakan http "
 "atau BitTorrent. Pada keduanya, sebuah jendela memberi Anda informasi, "
@@ -3518,9 +3589,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3530,8 +3601,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Centang tombol Simpan Berkas."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3540,80 +3611,95 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Memeriksa keabsahan media yang diunduh"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Buka konsol, tidak perlu menjadi root, dan:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Untuk menggunakan md5sum, ketik: [sam@localhost]$ <userinput>md5sum path/"
 "to/the/image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- 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:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"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><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"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:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Bakar atau salin ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "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:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Membakar ISO ke CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Gunakan burner apapun yang Anda inginkan tapi pastikan perangkat burning "
 "diatur dengan benar ke <emphasis role=\"bold\">burn image</emphasis>, burn "
@@ -3621,12 +3707,12 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">wiki Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Salin ISO ke flashdisk"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3635,30 +3721,31 @@ msgstr ""
 "flashdisk lalu menggunakannya untuk memboot dan menginstall sistem."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3667,69 +3754,66 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Anda bisa mencoba:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Anda juga bisa menggunakan dd dari konsol:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Buka konsol"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "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:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3738,25 +3822,33 @@ msgstr ""
 "manajer berkas apapun yang bisa membuka atau membacanya)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Masukkan perintah <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3780,45 +3872,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Dimana X=nama perangkat Anda misal: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Masukkan perintah: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Lepas flashdisk, selesai"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3851,19 +3953,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Jika negara Anda hanya dalam daftar <guilabel>Negara Lainnya</guilabel>, "
@@ -3872,19 +3976,19 @@ msgstr ""
 "sebenarnya."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Metode masukan"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 #, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Pada layar <guilabel>Negara Lainnya</guilabel> Anda juga bisa memilih metode "
@@ -3898,12 +4002,13 @@ msgstr ""
 "paket."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Jika Anda melewatkan pengaturan metode input saat instalasi, Anda bisa "
 "mengaksesnya setelah menjalankan ulang komputer melalui \"Konfigurasi "
@@ -3911,55 +4016,54 @@ msgstr ""
 "sebagai root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Install atau Upgrade"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Install"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Gunakan pilihan ini untuk instalasi <application>Mageia</application> baru."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Upgrade"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Jika Anda memilihi satu atau lebih instalasi <application>Mageia</"
-"application> pada sistem, installer akan memberi pilihan untuk upgrade salah "
-"satunya."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Hanya upgrade dari versi Mageia yang <emphasis>masih didukung</emphasis> "
 "saat versi installer ini dirilis, yang telah sepenuhnya diuji. Jika Anda "
@@ -3968,16 +4072,17 @@ msgstr ""
 "membiarkan partisi <literal>/home</literal> Anda."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Jika selama instalasi Anda memutuskan untuk menghentikannya, Anda bisa "
 "menjalankan ulang komputer, tapi pikir dua kali sebelum melakukannya. "
@@ -3989,12 +4094,14 @@ msgstr ""
 "Ctrl Delete</guilabel> secara bersamaan untuk menjalankan ulang."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Jika Anda terlupa untuk memilih bahasa tambahan, Anda bisa kembali dari "
 "layar \"Install atau Upgrade\" ke layar pemilihan bahasa dengan menekan "
@@ -4026,12 +4133,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Keyboard"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4040,16 +4147,17 @@ msgstr ""
 "yang cocok maka layout keyboard US akan digunakan."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4066,23 +4174,25 @@ msgstr ""
 "Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Setelah memilih keyboard dari dialog <guibutton>Lainnya</guibutton>, Anda "
 "akan kembali ke dialog pilihan keyboard pertama dan walaupun sepertinya "
@@ -4091,23 +4201,24 @@ msgstr ""
 "daftar lengkap."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Jika Anda memilih keyboard yang berbasis karakter bukan latin, Anda akan "
 "melihat layar dialog tambahan yang menanyakan bagaimana Anda akan melakukan "
 "pergantian layout keyboard di antara Latin dan bukan Latin"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Silakan pilih bahasa yang akan digunakan"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4118,7 +4229,7 @@ msgstr ""
 "instalasi dan pada sistem yang sudah terinstall."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -4129,12 +4240,13 @@ msgstr ""
 "instalasi dan pada sistem yang sudah terinstall."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Jika sepertinya Anda akan memerlukan beberapa bahasa untuk komputer Anda, "
 "untuk Anda sendiri atau orang lain, maka gunakanlah tombol <guibutton>Banyak "
@@ -4142,7 +4254,7 @@ msgstr ""
 "menambahkan dukungan bahasa tambahan setelah instalasi selesai."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -4156,18 +4268,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "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:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4176,23 +4289,24 @@ msgstr ""
 "disarankan untuk menginstall bahasa dari keyboard yang digunakan juga."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "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:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4247,24 +4361,24 @@ msgstr ""
 "tombol atau lebih."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Tambah atau Modifikasi Entri Menu Boot"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 #, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
 "UEFI, lihat: <link ns2:href=\"https://wiki.mageia.org/en/"
@@ -4272,45 +4386,45 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 #, fuzzy
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Menu grafis Mageia sangat cantik :"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4325,25 +4439,27 @@ msgstr ""
 "\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4356,50 +4472,51 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4412,18 +4529,19 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Gunakan bootloader yang ada"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah "
 "ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus "
@@ -4431,20 +4549,20 @@ msgstr ""
 "menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4457,14 +4575,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4473,131 +4591,126 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>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:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Layanan</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Pengaturan SCSI"
 
@@ -4610,36 +4723,39 @@ msgstr "Pengaturan SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX biasanya mendeteksi harddisk dengan benar. Dengan kontroler SCSI lama "
 "mungkin tidak akan bisa menentukan driver yang tepat untuk digunakan dan "
 "menyebabkan gagal mengenali perangkat."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Jika ini terjadi, Anda harus menentukan secara manual perangkat SCSI mana "
 "yang Anda miliki pada Drakx."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX lalu akan bisa mengkonfigurasi perangkat yang tepat."
 
@@ -4661,10 +4777,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Di layar ini, nama driver yang dipilih oleh insaller untuk perangkat suara "
 "Anda diberikan, yang akan jadi driver baku jika ada."
@@ -4686,10 +4802,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Lalu, pada draksound atau layar alat \"Konfigurasi Suara\", klik "
 "<guibutton>Lanjutan</guibutton> lalu <guibutton>Pemecahan masalah</"
@@ -4697,32 +4815,35 @@ msgstr ""
 "masalah."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Lanjutan"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "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:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "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:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Konfirmasi harddisk yang akan diformat"
 
@@ -4733,29 +4854,35 @@ msgstr "Konfirmasi harddisk yang akan diformat"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klik <guibutton>Sebelumnya</guibutton> jika Anda tidak yakin dengan pilihan "
 "Anda."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klik pada <guibutton>Selanjutnya</guibutton> jika Anda yakin dan ingin "
 "menghapus semua partisi, semua sistem operasi dan semua data pada harddisk "
@@ -4867,16 +4994,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Uninstall Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Tata cara"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Jika Mageia tidak meyakinkan Anda atau Anda tidak bisa menginstallnya dengan "
@@ -4884,28 +5007,30 @@ msgstr ""
 "memberikan kemungkinan untuk melakukan uninstall. Ini tidak ada di semua "
 "sistem operasi."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Setelah backup data Anda, jalankan ulang DVD instalasi Mageia, lalu pilih "
 "sistem Penyelamat, lalu, Kembalikan boot loader Windows. Pada boot "
 "berikutnya, Anda hanya akan punya Windows tanpa pilihan untuk memilih sistem "
 "operasi."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Untuk mengembalikan ruang yang digunakan oleh Mageia pada Windows, klik pada "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4915,8 +5040,8 @@ msgstr ""
 "kanan pada setiap partisi tersebut lalu pilih <guibutton>Delete</guibutton>. "
 "Ruang akan dibebaskan."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -4924,14 +5049,15 @@ 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><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Jika Anda menggunakan Vista atau 7, Anda punya kemungkinan lainnya, Anda "
 "bisa memperluas partisi yang ada di sisi kiri dari ruang bebas. Ada juga "
@@ -4978,6 +5104,330 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>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."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Apapun yang disimpan oleh akun tamu dengan <emphasis>rbash</emphasis> "
+#~ "bawaan yang disimpan di direktori /home akan dihapus saat dia keluar.  "
+#~ "Tamu harus menyimpan file pentingnya ke dalam flashdisk."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Hidupkan akun tamu</guilabel>: Di sini Anda bisa menghidupkan "
+#~ "atau mematikan akun tamu. Akun tamu memungkinkan tamu masuk dan "
+#~ "menggunakan komputer, tapi dia memiliki akses yang lebih terbatas "
+#~ "daripada pengguna normal."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID grup</guilabel>: Ini untuk mengatur ID grup.  Nomor juga, "
+#~ "biasanya sama dengan pengguna. Biarkan kosong kecuali jika Anda "
+#~ "mengetahui apa yang harus diisikan di sini."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Perangkat\", terdiri dari: \"harddisk\", [\"nomor harddisk\"(huruf)], "
+#~ "\"nomor partisi\" (contohnya, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Lingkungan kerja."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Lingkungan Grafis"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Ada empat grup, klik pada segitiga sebelum grup untuk membentangkan dan "
+#~ "melihat layanan yang ada di dalamnya."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Jika tidak menemukan perangkat Anda di daftar pabrikan (karena belum "
+#~ "masuk basis data atau perangkat lawas) Anda mungkin bisa menemukan driver "
+#~ "yang cocok di kategori Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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-"
+#~ "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 "\"Align to\" \"MiB\""
+#~ msgstr "\"Selaraskan ke\" \"MiB\""
+
+#~ 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 ""
+#~ "Dari layar awal ini dimungkinkan untuk mengatur beberapa pengaturan "
+#~ "pribadi:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Bahasa (untuk instalasi saja, mungkin berbeda dengan bahasa yang dipilih "
+#~ "untuk sistem) dengan menekan tombol F2 (hanya mode Legacy)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Seperti ini contohnya, layar sambutan bahasa Perancis ketika menggunakan "
+#~ "Live DVD/CD. Ingat bahwa menu Live DVD/CD tidak disodorkan: "
+#~ "<guilabel>Sistem Penyelamat</guilabel>, <guilabel>Pengujian memori</"
+#~ "guilabel> dan <guilabel>Peralatan Pendeteksian Perangkat Keras</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Tambahkan beberapa opsi kernel dengan menekan tombol <emphasis role=\"bold"
+#~ "\">F6</emphasis> untuk mode legacy atau tombol <emphasis role=\"bold\">e</"
+#~ "emphasis> untuk mode UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Jika instalasi gagal, mungkin penting untuk mencoba kembali menggunakan "
+#~ "salah satu opsi tambahan. Menu yang dipanggil dengan F6 menampilkan baris "
+#~ "baru yang disebut <guilabel>Opsi boot</guilabel> dan menawarkan empat "
+#~ "entri:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Tambahkan lebih banyak opsi kernel dengan menekan tombol F1 (hanya mode "
+#~ "Legacy)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Ini adalah layar sambutan baku ketika menggunakan CD Instalasi Jaringan "
+#~ "Kabel (image Boot.iso atau Boot-Nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Ini tidak memungkinkan untuk mengubah bahasa, pilihan yang tersedia "
+#~ "dijelaskan pada layar. Untuk informasi tentang menggunakan CD Instalasi "
+#~ "Jaringan Kabel, lihat <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+#~ "iso_install\">Wiki Mageia</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Layout keyboard adalah layout Amerika."
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Anda bisa mengatur penyesuaian tingkat keamanan di sini."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Biarkan tetap pada pengaturan bawaan jika Anda tidak mengerti apa yang "
+#~ "harus dipilih."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Media CD hanya-boot"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Centang tombol Simpan Berkas."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Anda juga bisa menggunakan dd dari konsol:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Lepas flashdisk, selesai"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "Jika Anda memilihi satu atau lebih instalasi <application>Mageia</"
+#~ "application> pada sistem, installer akan memberi pilihan untuk upgrade "
+#~ "salah satunya."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Tata cara"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4992,9 +5442,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Sesuaian"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5005,20 +5452,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
-#~ "kinerja."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -5260,21 +5693,6 @@ msgstr ""
 #~ "</imageobject>"
 
 #~ msgid ""
-#~ "<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>"
-#~ 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>"
-
-#~ msgid ""
 #~ "You can add an entry or modify the one you select first, by pressing the "
 #~ "relevant button in the <emphasis>Bootloader Configuration</emphasis> "
 #~ "screen and editing the screen that pops up on top of it."
diff --git a/docs/docs/stable/installer/it.po b/docs/docs/stable/installer/it.po
index 4c369fcb..cafcf3da 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: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\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"
@@ -34,13 +34,17 @@ msgstr "Note di rilascio"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:40
@@ -68,8 +72,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Per accettare, seleziona semplicemente <guilabel>Accetta</guilabel> e quindi "
@@ -91,9 +96,10 @@ msgstr "Note di rilascio"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Vengono date informazioni importanti riguardo al rilascio di "
@@ -101,13 +107,13 @@ msgstr ""
 "<guibutton>Rilascia Note</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "it"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selezione dei Media (Configura Media di Installazione Supplementari)"
 
@@ -115,23 +121,25 @@ msgstr "Selezione dei Media (Configura Media di Installazione Supplementari)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Questa schermata vi dà la lista degli archivi già riconosciuti. È possibile "
 "aggiungere altre fonti per i pacchetti, come un disco ottico o una sorgente "
@@ -139,23 +147,25 @@ msgstr ""
 "disponibili per la selezione durante i passaggi successivi."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Per le risorse di rete, ci sono due passi da seguire:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Scelta e attivazione della rete, in caso non sia già attiva."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Seleziona uno specchio o specifica un URL (il primo ingresso). Selezionando "
 "uno specchio, hai accesso alla selezione di tutti i depositi gestiti da "
@@ -163,14 +173,14 @@ msgstr ""
 "designare un deposito specifico o la tua stessa installazione NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -180,7 +190,7 @@ msgstr "Gestione dell'utente e del superuser"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -193,27 +203,27 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Imposta la password dell'amministratore (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Tutte le passwords sono sensibili alle maiuscole, la cosa migliore in una "
@@ -221,20 +231,21 @@ msgstr ""
 "e altri caratteri."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Inserisci un utente"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -243,7 +254,7 @@ msgstr ""
 "utente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -252,119 +263,91 @@ msgstr ""
 "spazio."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "I permessi di accesso possono anche essere cambiati dopo l'installazione."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gestione Avanzata Utenti"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Inoltre, puoi disattivare o attivare un account speciale."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
+"The <guibutton>Advanced</guibutton> 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:86
+#: en/addUser.xml:101
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
-"<guilabel>Abilita guest account</guilabel>: Qua puoi abilitare o "
-"disabilitare un guest account. Un guest account permette a degli ospiti di "
-"eseguire il log in e utilizzare il PC, ma con un accesso molto limitato "
-"rispetto a un utente normale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>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:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Group ID</guilabel>: Questo ti permette di impostare il group ID. "
-"Anche questo un numero, di solito lo stesso dell'utente. Lasciare vuoto nel "
-"caso in cui tu non sappia cosa fare."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Scegli i punti di mount"
 
@@ -381,17 +364,21 @@ msgstr "Scegli i punti di mount"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -399,60 +386,66 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Se cambi qualcosa assicurati di avere ancora una partizione <literal>/</"
 "literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Ogni partizione è mostrata come segue: \"Dispositivo\" (\"Capacità\", "
 "\"Mount point\", \"Tipo\")"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Per le partizioni a cui non necessiti avere accesso puoi lasciare uno spazio "
 "vuoto nel punto di mount."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -671,14 +664,14 @@ 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 "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -696,13 +689,14 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -724,7 +718,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -732,58 +726,63 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Stazione di lavoro."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Ambiente grafico."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Scegli dei pacchetti individuali"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Qui tu puoi aggiungere o rimuovere ogni pacchetto aggiuntivo per "
 "personalizzare la tua installazione"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -793,52 +792,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configura i tuoi servizi"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Qua puoi scegliere quali servizi (non) devono essere avviati al boot del "
 "sistema."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Le impostazioni che sceglie DrakX sono generalmente buone."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Cambia le cose solo quando sai veramente bene cosa stai facendo."
 
@@ -851,28 +850,34 @@ msgstr "Configura il tuo fuso orario"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Nella prossima schermata potrai scegliere di impostare il tuo orologio "
 "hardware con l'ora locale o GMT (anche conosciuto come UTC)."
@@ -887,23 +892,24 @@ msgstr ""
 "tutti impostati sull'ora locale o tutti con UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Scegli un server X (configura la tua scheda video)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -912,7 +918,7 @@ msgstr ""
 "correttamente il dispositivo video."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -921,41 +927,37 @@ msgstr ""
 "sai di quale si trtta puoi selezionarla dall'elenco:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "venditore"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "poi il nome della tua scheda"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "e il tipo di scheda"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Attento che selezionando un driver incompatibile potresti avere accesso alla "
 "sola interfaccia da linea di comando."
@@ -964,50 +966,50 @@ msgstr ""
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1016,56 +1018,56 @@ msgstr ""
 "scheda video dalla lista se necessario."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Una refresh rate scorretta potrebbe danneggiare il monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Risoluzione</guibutton></emphasis>: Imposta la "
 "risoluzione desiderata e la profondità di colore."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Scegliere proprio monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1074,32 +1076,32 @@ msgstr ""
 "identificherà correttamente il tuo."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalizzatp</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1108,7 +1110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1117,12 +1119,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1131,49 +1133,50 @@ msgstr ""
 "database dei monitor."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "Il nome del produttore del monitor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "la descrizione del monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generico</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1185,12 +1188,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Se desideri utilizzare una criptazione per la tua partizione <literal>/</"
 "literal> devi prima assicurarti di avere una partizione <literal>/boot</"
@@ -1198,90 +1203,89 @@ msgstr ""
 "literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"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:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Premi <guibutton>Cancella tutto</guibutton> per cancellare tutte le "
 "partizioni sul dispositivo di storage selezionato."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "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:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continua sino a quando non avrai impostato tutto come desideri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1294,27 +1298,27 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partizionamento"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1327,12 +1331,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Utilizza le partizioni esistenti"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1341,12 +1345,12 @@ msgstr ""
 "Linux compatibili e potrebbero essere usate per l'installazione."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Utilizza lo spazio libero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1355,12 +1359,12 @@ msgstr ""
 "per la tua nuova installazione di Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Usa lo spazio libero di una partizione Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1369,7 +1373,7 @@ msgstr ""
 "l'installer potrebbe offrirti di utilizzarla."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1377,7 +1381,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1388,46 +1392,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Formatta e utilizza tutto il disco"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Questa opzione userà l'intero disco per Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. Fai "
 "attenzione!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1435,87 +1441,96 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1527,7 +1542,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1537,31 +1552,34 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr ""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr ""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis>Venditore</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Assicurati anche che tutte le partizioni siano create con un numero pari di "
 "megabytes."
@@ -1572,7 +1590,7 @@ msgid "Installation from LIVE medium"
 msgstr ""
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1587,18 +1605,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "La documentazione ufficiale di Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1610,7 +1628,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1622,7 +1640,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1634,13 +1652,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1649,26 +1667,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installazione con DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Febbraio 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1676,7 +1702,7 @@ msgstr "Complimenti"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1687,7 +1713,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1695,16 +1721,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "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:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1713,12 +1740,12 @@ msgstr ""
 "Mageia verrà automaticamente selezionata e avviata."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Divertiti!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1733,31 +1760,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1769,21 +1796,19 @@ msgstr "<emphasis>Venditore</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Generico</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1791,28 +1816,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formattazione in corso"
 
@@ -1821,33 +1846,37 @@ msgstr "Formattazione in corso"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Qua puoi scegliere quale/i partizione/i desideri formattare. Ogni dato nelle "
 "partizioni <emphasis>non</emphasis> contrassegnate per la formattazione "
 "verrà salvato."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -1856,16 +1885,16 @@ msgstr ""
 "desideri controllare per i cosiddetti <emphasis>bad blocks</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -1874,12 +1903,12 @@ msgstr ""
 "guibutton> per proseguire."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'assistente all'installazione di Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1890,7 +1919,7 @@ msgstr ""
 "possibile."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1899,65 +1928,74 @@ msgstr ""
 "l'installer che è normalmente tutto ciò di cui hai bisogno."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Schermata di benvenuto dell'installazione"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Disinstallare Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Ecco le schermate di benvenuto quanddo si utilizza una DVD di Mageia. La "
 "prima è con un sistema legacy, la seconda con un sistema UEFI."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"Per la prima schermata è possibile impostare qualche preferenza personale:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"La lingua (per la sola installazione, può essere diversa da quella scelta "
-"per il sistema) premendo il tasto F2 (solo nella modalità Legacy)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -1966,34 +2004,23 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+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)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2002,57 +2029,59 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- 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 ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Default, non cambia niente nelle opzioni di default."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2061,26 +2090,20 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Aggiungi ulteriori opzioni kernel premendo il tasto F1 (solo nella modalità "
-"Legacy)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 #, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "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:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2089,16 +2112,16 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2107,12 +2130,15 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "L'aiuto viene tradotto nella lingua scelta con il tasto F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2123,79 +2149,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-#, fuzzy
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Questo è la schermata di benvenuto di default quando si usa un'installazione "
-"CD Wired Network-based (immagini Boot.iso o Boot-Nonfree.iso:"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "La mappatura della tastiera è quella americana."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "I passi dell'installazione"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Il processo di installazione è diviso in step che possono essere seguiti sul "
 "pannello a lato dello schermo."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "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:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "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:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2203,19 +2198,27 @@ msgid ""
 "<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
 "<guibutton>Alt Ctrl Delete</guibutton> 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><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemi relativi all'installazione e soluzioni possibili"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Nessuna interfaccia grafica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2223,22 +2226,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "L'installazione si blocca"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2248,32 +2253,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problema relativo alla RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Partizioni dinamiche"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2286,34 +2292,36 @@ msgstr "Aggiornamenti"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Poi premi <guibutton>Avanti</guibutton> per continuare"
 
 #. type: Content of: <section><info><title>
@@ -2367,18 +2375,19 @@ msgstr "Selezione media (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2387,14 +2396,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2404,61 +2413,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Installazione minimale"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2468,15 +2477,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2493,11 +2503,12 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX fa scelte intelligenti per la configurazione del tuo sistema in base "
 "alle scelte da te fatte e dall'hardware che DrakX ha individuto. Puoi "
@@ -2507,8 +2518,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2523,74 +2534,76 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parametri del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuso orario</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX ha automaticamente selezionato una time zone in base alla tua lingua. "
 "Puoi effettuare dei cambiamenti se lo desideri. Guarda anche <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Paese / Regione</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Se non ti trovi nel Paese selezionato è molto importante che tu corregga le "
 "impostazioni. Guarda <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX ha fatto buone scelte per le impostazioni del bootloader."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 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:69
+#: 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:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestione dell'utente</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2599,22 +2612,23 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servizi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "I servizi di sistema sono quei piccoli programmi che lavorano in background "
 "(demoni). Questo strumentio ti permette di abilitare o disabilitare certi "
 "task."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2623,78 +2637,78 @@ msgstr ""
 "potrebbe impedire al tuo computer di lavorare correttamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Per ulteriori informazioni, consulta <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parametri dell'hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastiera</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Scheda audio</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaccia grafica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Per ulteriori informazioni, consulta <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -2705,20 +2719,21 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parametri di rete e di Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rete</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -2727,19 +2742,19 @@ msgstr ""
 "Center</application> se non hai abilitato i repository Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2750,26 +2765,27 @@ msgstr ""
 "per utilizzare un servizio proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "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:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sicurezza"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Livello di sicurezza</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2779,17 +2795,17 @@ msgstr ""
 "un uso generale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Spunta l'opzione che meglio si combina al tuo utilizzo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -2798,7 +2814,7 @@ msgstr ""
 "mascalzoni in internet che potrebbero comprometterli o rubarli."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 #, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
@@ -2809,7 +2825,7 @@ msgstr ""
 "selezioni dipendono dall'uso che fai del tuo computer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -2873,39 +2889,74 @@ msgstr ""
 "installare <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 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 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Puoi impostare il tuo livello di sicurezza qua."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Lascia le impostazioni di default come sono se non sai cosa scegliere."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Dopo aver installato sarà sempre possibile modificare le tue impostazioni di "
 "sicurezza nella sezione <guilabel>Sicurezza</guilabel> del Mageia Control "
@@ -2925,95 +2976,100 @@ msgstr "Introduzione"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definizione"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Puoi trovarli <link ns4:href=\"http://www.mageia.org/en/downloads/\">qui</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Media di installazione classico"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Funzioni comuni"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Queste ISO usano l'installer tradizionale chiamato drakx"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "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:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Diversi media per architetture a 32 o 64 bit."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3022,12 +3078,12 @@ msgstr ""
 "Sistema, Test della Memoria, Strumento di Identificazione Hardware."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Ogni DVD contiene diversi desktop environments e lingue."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3035,106 +3091,111 @@ msgstr ""
 "non free."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Media live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "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:80
+#: 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)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">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><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Contengono del software non libero."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "DVD Live con KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 #, fuzzy
 msgid "Plasma desktop environment only."
 msgstr "Solamente l'ambiente KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Sono presenti tutte le lingue."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "DVD Live con GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Solamente l'ambiente GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 #, fuzzy
 msgid "Live DVD Xfce"
 msgstr "DVD Live con KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 #, fuzzy
 msgid "Xfce desktop environment only."
 msgstr "Solamente l'ambiente KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 #, fuzzy
 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:140
-msgid "Boot-only CD media"
-msgstr "Boot-only CD media"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Media di installazione classico"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3146,28 +3207,30 @@ msgstr ""
 "network locale o su internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "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:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Solamente la lingua inglese."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
@@ -3206,9 +3269,9 @@ msgstr "Download in corso"
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "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 "
@@ -3223,9 +3286,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3235,7 +3298,7 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3245,80 +3308,95 @@ 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:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Aprire la console, senza obbligo di essere root, e:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Per usare md5sum digitare: [sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- 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:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"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><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"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:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Masterizza o esegui un dump dell'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "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:234
+#: en/SelectAndUseISOs2.xml:242
 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:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Usa qualsiasi programma di masterizzazione che desideri, ma assicurati che "
 "il dispositivo sia correttamente impostato in <emphasis role=\"bold"
@@ -3327,12 +3405,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">wiki di Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Esegui il dump di una ISO su di una chiavetta USB."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3341,30 +3419,31 @@ msgstr ""
 "una chiavetta USB e usarle per avviare e installare il sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"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:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3373,69 +3452,66 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Potresti provare:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Puoi anche usare il tool dd in una console:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Apri una console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "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:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3444,25 +3520,33 @@ msgstr ""
 "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:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Inserisci il comando <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3486,45 +3570,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Dove X = nome del tuo dispositivo esempio: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Inserire il comando: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Togli la tua chiavetta USB, hai concluso"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3553,19 +3647,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Se il tuo Paese si trova solo nella lista <guilabel>Altri Paesi</guilabel> "
@@ -3574,80 +3670,79 @@ msgstr ""
 "scelta reale."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Metodo di input"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installa o aggiorna"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installa"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Usa questa opzione per un'installazione pulita di <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Aggiorna"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Se hai una o più installazioni di <application>Mageia</application> sul tuo "
-"sistema questo installer ti permetterà di aggiornare una di queste "
-"all'ultima release."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Solo l'aggiornamento da versioni precedenti di Mageia che erano "
 "<emphasis>ancora supportate</emphasis> quando la versione dell'installer è "
@@ -3657,16 +3752,17 @@ msgstr ""
 "preservando la partizione <literal>/home</literal>"
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Se durante l'installazione decidi di terminarla è possibile eseguire un "
 "reboot, ma per favore pensaci due volte prima di farlo. Una volta che una "
@@ -3678,12 +3774,14 @@ msgstr ""
 "insieme <guilabel>Alt Ctrl Delete</guilabel> per riavviare."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Se hai scoperto di aver dimenticato di selezionare una lingua addizionale "
 "puoi tornare dalla schermata \"Installa o aggiorna\" alla scelta della "
@@ -3712,12 +3810,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3726,16 +3824,17 @@ msgstr ""
 "tastiera adatta non viene trovata verrà impostato di default il layout US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3752,22 +3851,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "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:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Dopo aver scelto un layout dalla schermata <guibutton>Altro</guibutton> "
 "tornerai alla prima schermata di dialogo e sembrerà che la tastiera "
@@ -3776,23 +3877,24 @@ msgstr ""
 "completa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Se scegli una tastiera con caratteri non-latini vedrai un'ulteriore "
 "schermata di dialogo che ti chiederà come preferisci cambiare fra layout a "
 "caratteri latini e non-latini."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Scegli una lingua da utilizzare"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3800,23 +3902,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -3829,35 +3931,35 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3910,24 +4012,24 @@ msgstr ""
 "pulsanti."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Aggiungi o modifica una Boot Menu Entry"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 #, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e "
 "UEFI visitare: <link ns2:href=\"https://wiki.mageia.org/en/"
@@ -3935,44 +4037,44 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Opzioni principali del bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Opzioni principali del bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -3985,25 +4087,27 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4016,50 +4120,51 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4072,35 +4177,35 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Usare un bootloader esistente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4113,14 +4218,14 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4128,127 +4233,122 @@ msgid ""
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Servizi</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Installa SCSI"
 
@@ -4261,20 +4361,22 @@ msgstr "Installa SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX solitamente determina gli hard disks correttamente. Con qualche "
 "vecchio controller SCSI potrebbe non essere in grado di determinare "
@@ -4282,16 +4384,17 @@ msgstr ""
 "l'hard disk."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Se dovesse accadere, dovrai dire manualmente a Drakx quale SCSI drive "
 "possiedi."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX dovrebbe essere in grado di configurare il drive correttamente."
 
@@ -4315,8 +4418,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4332,33 +4434,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avanzato"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Conferma l'hard disk per essere formattato."
 
@@ -4369,29 +4473,35 @@ msgstr "Conferma l'hard disk per essere formattato."
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Clicca su <guibutton>Precedente</guibutton> se non sei sicuro della tua "
 "scelta."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Clicca su <guibutton>Sucessivo</guibutton> se sei sicuro e vuoi cancellare "
 "ogni partizione, ogni sistema operativo e ogni file da quell'hard disk."
@@ -4499,16 +4609,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Disinstallare Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Come fare"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Se Mageia non ti convince o non riesci ad installarlo correttamente, in "
@@ -4516,45 +4622,46 @@ msgstr ""
 "Questo è un tuo diritto e Mageia ti permette di disinstallarla. Questo non "
 "accade per ogni sistema operativo."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "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 "
 "prossimo boot, avrai solo Windows senza alcuna opzione di scegliere il tuo "
 "sistema operativo."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4594,6 +4701,227 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Inoltre, puoi disattivare o attivare un account speciale."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Abilita guest account</guilabel>: Qua puoi abilitare o "
+#~ "disabilitare un guest account. Un guest account permette a degli ospiti "
+#~ "di eseguire il log in e utilizzare il PC, ma con un accesso molto "
+#~ "limitato rispetto a un utente normale."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Group ID</guilabel>: Questo ti permette di impostare il group "
+#~ "ID. Anche questo un numero, di solito lo stesso dell'utente. Lasciare "
+#~ "vuoto nel caso in cui tu non sappia cosa fare."
+
+#~ msgid "Workstation."
+#~ msgstr "Stazione di lavoro."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Ambiente grafico."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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-"
+#~ "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>"
+
+#, fuzzy
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Per la prima schermata è possibile impostare qualche preferenza personale:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "La lingua (per la sola installazione, può essere diversa da quella scelta "
+#~ "per il sistema) premendo il tasto F2 (solo nella modalità Legacy)."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Aggiungi ulteriori opzioni kernel premendo il tasto F1 (solo nella "
+#~ "modalità Legacy)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Questo è la schermata di benvenuto di default quando si usa "
+#~ "un'installazione CD Wired Network-based (immagini Boot.iso o Boot-Nonfree."
+#~ "iso:"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "La mappatura della tastiera è quella americana."
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Puoi impostare il tuo livello di sicurezza qua."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Lascia le impostazioni di default come sono se non sai cosa scegliere."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Boot-only CD media"
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Puoi anche usare il tool dd in una console:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Togli la tua chiavetta USB, hai concluso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "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."
+#~ msgstr ""
+#~ "Se hai una o più installazioni di <application>Mageia</application> sul "
+#~ "tuo sistema questo installer ti permetterà di aggiornare una di queste "
+#~ "all'ultima release."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Come fare"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4608,9 +4936,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Personalizzato"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -4621,13 +4946,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
diff --git a/docs/docs/stable/installer/ja.po b/docs/docs/stable/installer/ja.po
index 63f19894..02413abf 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-26 14:11+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -29,12 +29,13 @@ msgstr "使用許諾契約とリリース ノート"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -68,8 +69,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "承諾するには、単純に<guilabel>承諾する</guilabel>を選択して<guibutton>次へ</"
@@ -92,9 +94,10 @@ msgstr "リリース ノート"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "このリリースの <application>Mageia</application> についての重要な情報が提供さ"
@@ -102,13 +105,13 @@ msgstr ""
 "れを参照できます。"
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "ja"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "メディアの選択 (追加のインストール メディアを設定する)"
 
@@ -116,46 +119,50 @@ msgstr "メディアの選択 (追加のインストール メディアを設定
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "この画面は認識済みのリポジトリの一覧を示しています。あなたは光学ディスクやリ"
 "モート ソースのように他のパッケージ入手先を追加できます。この入手先の選択は、"
 "以降のステップにおける利用可能パッケージに影響します。"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "ネットワーク ソースでは、以下の 2 つのステップが続きます:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "ネットワークが有効化されていなければ、選択および有効化を行います。"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "ミラーを選択するか、URL (一覧の一番上の項目) を指定します。ミラーを選択するこ"
 "とで Mageia に管理されているすべてのリポジトリを自由に選択できるようになり、"
@@ -164,14 +171,15 @@ msgstr ""
 "し示すことができます。"
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "幾つかの 32 ビットのパッケージを含む可能性のある 64 ビット OS を更新する場"
 "合、この画面でいずれかのネットワーク プロトコルを選択してオンライン ミラーを"
@@ -187,7 +195,7 @@ msgstr "ユーザとスーパーユーザの管理"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -200,21 +208,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "管理者 (root) のパスワードを設定する:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "<application>Mageia</application> のインストールされたすべての環境でスーパー"
 "ユーザもしくは管理者のパスワードを設定することが望ましいです。これは通常、"
@@ -226,32 +234,35 @@ msgstr ""
 "てチェックします。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "すべてのパスワードは大文字と小文字を区別し、パスワードの中でアルファベット "
 "(大文字と小文字), 数字, 他の文字を混在させて使うのが最適です。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "ユーザを入力する"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "ここでユーザを追加します。ユーザはスーパーユーザ (root) よりも権限が少ないで"
 "すが、インターネットやオフィス アプリケーションを使用したりゲームで遊んだり普"
 "通のユーザが自分のコンピュータで何か他のことを行ったりするのには十分です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -260,7 +271,7 @@ msgstr ""
 "コンを変更します。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -269,10 +280,11 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>ログイン名</guilabel>: このユーザのログイン名をここに入力します。も"
@@ -280,40 +292,42 @@ msgstr ""
 "イン名は大文字と小文字を区別します。</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>パスワード</guilabel>: このテキスト ボックスにユーザのパスワードを"
 "入力するべきです。テキスト ボックスの右端にはパスワードの強度を示す盾が表示さ"
 "れます。(<xref linkend=\"givePassword\"/>も参照)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>パスワード (再入力)</guilabel>: 再びユーザのパスワードをこのテキス"
-"ト ボックスに入力します。drakx はユーザ パスワードの両方のテキスト ボックスに"
-"同じパスワードを入力したかをチェックします。"
+"<guilabel>パスワード (再入力)</guilabel>: パスワードを再入力し、Drakx は上の"
+"パスワードと一致するかをチェックします。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Mageia のインストール時に追加したユーザには、読み書きの両方で保護されたホー"
 "ム ディレクトリ (umask=0027) が用意されます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -321,86 +335,58 @@ msgstr ""
 "ステップで追加できます。<emphasis>ユーザの管理</emphasis>を選択してください。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "アクセス権はインストール後に変更することもできます。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "ユーザの高度な管理"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "<guibutton>上級</guibutton>ボタンをクリックすると、追加中のユーザ向けの設定を"
 "編集する画面が表示されます。"
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "更に、ゲスト アカウントを無効化もしくは有効化することが可能です。"
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"既定のゲスト アカウント <emphasis>rbash</emphasis> が自分の /home ディレクト"
-"リ内に保存したものはログアウト時に削除されます。このゲストは大事なファイルを "
-"USB キーに保存するのがよいでしょう。"
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>ゲスト アカウントを有効にする</guilabel>: ここでゲスト アカウントを"
-"有効化もしくは無効化することができます。このゲスト アカウントは来客をこの PC "
-"にログインして使用できるようにしますが、通常のユーザよりも権限が限られていま"
-"す。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>シェル</guilabel>: このドロップ ダウン リストでは前の画面で追加中の"
 "ユーザが使用するシェルを Bash, Dash, Sh から選択して変更できます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ユーザ ID</guilabel>: ここでは前の画面で追加中のユーザのユーザ ID "
 "を設定できます。これは数字です。何をしているのか分かっているのでなければ空欄"
 "のままにしてください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>グループ ID</guilabel>: グループ ID が設定できます。これも数字で、"
-"通常はユーザ ID と同じ値です。何をしているのか分かっているのでなければ空欄の"
-"ままにしてください。"
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "マウント ポイントを選択する"
 
@@ -417,13 +403,14 @@ msgstr "マウント ポイントを選択する"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -433,7 +420,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -444,41 +431,45 @@ msgstr ""
 "ト ポイントを変更することができます。"
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "変更を行った場合、<literal>/</literal> (ルート) パーティションがまだ存在して"
 "いるかを確認してください。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "各パーティションは以下のように表示されます: \"デバイス\" (\"容量\", \"マウン"
 "ト ポイント\", \"種類\")"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"デバイス\" は以下で構成されます: \"ハード ドライブ\", [\"ハード ドライブ番"
-"号\"(文字)], \"パーティション番号\" (例 \"sda5\")"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "たくさんのパーティションがある場合、たくさんのマウント ポイントをドロップ ダ"
 "ウン メニューから <literal>/</literal>, <literal>/home</literal>, <literal>/"
@@ -488,20 +479,22 @@ msgstr ""
 "<literal>/cauldron-home</literal>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "アクセスする必要のないパーティションに対しては、マウント ポイントの欄を空白に"
 "することができます。"
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "どれを選択するか分からない場合は<guibutton>戻る</guibutton>を選択し、"
 "<guilabel>パーティションを手動で設定</guilabel>を選択してください。続いて表示"
@@ -509,7 +502,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -773,16 +766,18 @@ msgstr "デスクトップの選択"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "ここでの選択内容により、細かい設定を行う追加の画面に進む場合があります。"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -801,14 +796,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "<application>KDE</application> か <application>Gnome</application> デスクトッ"
 "プ環境のどちらがお好みかを選択します。いずれも有用なアプリケーションとツール"
@@ -835,8 +832,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -847,62 +845,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "ワークステーション"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">パーティションの自動分割:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "サーバ"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "グラフィカル環境"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "パッケージを個別に選択: 手動でパッケージの追加や削除をするためにこの項目を使"
 "用することができます。"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "最小構成インストールを行う方法の説明 (X や IceWM を含まない場合と含む場合) に"
 "ついては <xref linkend=\"minimal-install\"/> をお読みください。"
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "パッケージを個別に選択する"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "ここでインストールをカスタマイズするために追加でパッケージを追加したり削除し"
 "たりすることができます。"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -917,47 +922,45 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "サービスを設定する"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "ここでシステムのブート時に開始する (しない) サービスを設定することができま"
 "す。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"四つのグループがあり、グループの前にある三角形をクリックすると展開され、その"
-"中のすべてのサービスが見えるようになります。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "DrakX が選択した設定は通常は適しています。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -966,7 +969,7 @@ msgstr ""
 "情報が表示されます。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "何をしているのかよく分かっている場合にだけ変更を行ってください。"
 
@@ -979,12 +982,13 @@ msgstr "タイム ゾーンを設定する"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -994,18 +998,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "あなたのいる国と同一タイム ゾーン内の近い都市を選択することでタイム ゾーンを"
 "選択します。"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "次の画面では、お使いのハードウェア時計をローカル時間と GMT (別名 UTC) のどち"
 "らに設定するかを選択できます。"
@@ -1020,23 +1026,23 @@ msgstr ""
 "に設定するか、もしくはすべてが UTC/GMT になるようにしてください。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "X サーバを選択する (グラフィック カードを設定する)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1045,7 +1051,7 @@ msgstr ""
 "お使いのビデオ デバイスを正しく識別します。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1055,100 +1061,98 @@ msgstr ""
 "ができます:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "ベンダ"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "カードの名前"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "カードの種類"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"お使いのカードがベンダ一覧にない場合 (データベースに未登録か古いカード) は "
-"Xorg カテゴリから適したドライバが見つかるかもしれません。"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg の一覧は 40 を超える汎用かつオープン ソースのビデオ カード ドライバを提"
 "供しています。お使いのカード向けの名前の付いたドライバが見つからない場合は基"
 "本的な機能を提供する vesa ドライバを使用するという選択肢があります。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "非互換なドライバを選択した場合はコマンド ライン インターフェースに対してしか"
 "アクセスできない点に留意してください。"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "幾つかのビデオ カードのメーカーは Nonfree リポジトリでのみ利用可能な Linux ド"
 "ライバを提供しており、場合によってはメーカーの Web サイトからしか入手できませ"
 "ん。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "これらにアクセスするには、Nonfree リポジトリを明示的に有効にする必要がありま"
 "す。以前にこれを選択したのでなければ、最初の再起動後にこれを行うのがよいで"
 "しょう。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "どのグラフィカル環境 (またはデスクトップ環境) をこの <application>Mageia</"
 "application> のインストールで選択したとしても、これらはすべて <acronym>X "
@@ -1161,7 +1165,7 @@ msgstr ""
 "定を選択してください。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1170,13 +1174,14 @@ msgstr ""
 "お使いのカードを一覧から選択します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>モニタ</guibutton></emphasis>: お使いのモニタが対応して"
 "いれば<guilabel>プラグ アンド プレイ</guilabel>を選択でき、そうでなければ"
@@ -1185,31 +1190,32 @@ msgstr ""
 "設定したいのであれば、<guilabel>カスタム</guilabel>を選択します。"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 "不正なリフレッシュ レートを指定するとモニタを破損する可能性があります。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>解像度</guibutton></emphasis>: お使いのモニタで使用した"
 "い解像度と色深度を設定します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>テスト</guibutton></emphasis>: このテスト ボタンはインス"
 "トール時に必ず現れるものではありません。もしボタンがあれば、これを押すことで"
@@ -1219,7 +1225,7 @@ msgstr ""
 "がない場合はあなたの設定が安全かを確認してください。</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1228,12 +1234,12 @@ msgstr ""
 "効にしたり無効にしたりできます。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "モニタを選択する"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1242,35 +1248,36 @@ msgstr ""
 "のモニタを正しく識別します。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>異なる特性のモニタを選択するとお使いのモニタやビデオ ハードウェアに"
 "損害を与える可能性があります。何をしているのか分かっている場合以外はいじらな"
 "いでください。</emphasis>不明な点があれば、モニタの説明書をご覧ください。"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>カスタム</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1282,7 +1289,7 @@ msgstr ""
 "表示される速度となります。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1294,12 +1301,12 @@ msgstr ""
 "点があれば、控えめな設定を選択した上でモニタの説明書をご覧ください。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>プラグ アンド プレイ</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1307,12 +1314,12 @@ msgstr ""
 "これは既定の選択肢で、モニタのデータベースからモニタの種類の決定を試みます。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>ベンダ</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1322,28 +1329,30 @@ msgstr ""
 "できます:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "モニタのメーカー名"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "モニタの説明"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>一般</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "このグループを選択すると 1024x768 @ 60Hz のような約 30 のディスプレイ設定が表"
 "示され、ラップトップで使用されるフラット パネル ディスプレイも含まれます。こ"
@@ -1352,12 +1361,12 @@ msgstr ""
 "のが賢明でしょう。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "DiskDrake によるパーティションのカスタム設定"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1368,12 +1377,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "<literal>/</literal> パーティションを暗号化したい場合、これとは別に "
 "<literal>/boot</literal> パーティションがなければなりません。<literal>/boot</"
@@ -1381,42 +1392,44 @@ msgstr ""
 "のシステムは起動不能になります。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "ここでお使いのディスクのレイアウトを調整します。パーティションを削除もしくは"
 "作成したり、ファイル システムを変更したりそのサイズを変更したり、開始前に中身"
 "を見ることさえできます。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"検出されたハード ディスクや他の USB キーのようなストレージ デバイスごとにタブ"
-"が存在します。例えば三つのデバイスがある場合は sda, sdb, sdc となります。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "選択されたストレージ デバイス上のすべてのパーティションを削除するには"
 "<guibutton>すべてをクリア</guibutton>を押します。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "他のすべての操作: はじめにお好きなパーティションをクリックします。次に表示, "
 "ファイル システムやマウント ポイントの選択, サイズ変更, 削除を行います。"
@@ -1425,32 +1438,34 @@ msgstr ""
 "追加のツールが利用できます。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "すべてを望み通りに調整し終えるまで続けます。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "準備ができたら<guibutton>完了</guibutton>をクリックします。"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Mageia を UEFI システムにインストールしている場合、ESP (EFI システム パーティ"
 "ション) が存在し、/boot/EFI に正しくマウントされているかをチェックしてくださ"
 "い。(下記参照)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1458,12 +1473,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1472,7 +1487,7 @@ msgstr ""
 "ションが存在し、種類が正しいことをチェックしてください"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1485,32 +1500,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "パーティションの設定"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "この画面ではお使いのハード ドライブの内容とともに <application>Mageia</"
 "application> をインストールする場所のために DrakX パーティション設定ウィザー"
 "ドが導き出した結果を見ることができます。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "下の一覧から利用可能な選択肢は特定のハード ドライブのレイアウトや内容によって"
 "変化します。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1523,12 +1540,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "既存のパーティションを使う"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1537,12 +1554,12 @@ msgstr ""
 "り、インストールに使用できます。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "空き領域を使う"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1551,12 +1568,12 @@ msgstr ""
 "Mageia のインストールに使用します。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Windows パーティションの空き領域を使う"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1565,7 +1582,7 @@ msgstr ""
 "ることを提案するかもしれません。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1576,7 +1593,7 @@ msgstr ""
 "くのがよいでしょう!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1593,12 +1610,14 @@ msgstr ""
 "奨します。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "この選択肢では、インストーラは残っている Windows パーティションを明るい青色"
 "で、Mageia のパーティションとなる領域は暗い青色で、それぞれサイズも反映して表"
@@ -1606,37 +1625,39 @@ msgstr ""
 "節することが可能です。下のスクリーンショットをご覧ください。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "ディスク全体を消去して使用"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "この選択肢ではドライブの全体を Mageia 用に使用します。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "注意! これは選択されたハード ドライブ上のすべてのデータを削除します。気をつけ"
 "てください!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1647,12 +1668,12 @@ msgstr ""
 "でください。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "パーティションを手動で設定"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1661,65 +1682,80 @@ msgstr ""
 "ができます。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">パーティションの自動分割:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "インストーラは利用可能な場所を以下のルールに従って分割します:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "合計空き領域が 50 GB 未満の場合、/ 用の一つのパーティションだけが作られ、/"
 "home パーティションは分割されません。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "合計空き領域が 50 GB を超える場合、三つのパーティションが作成されます"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "合計空き領域の 6/19 が / に最大で 50 GB 割り当てられます"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 がスワップに最大で 4 GB 割り当てられます"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "残り (最低でも 12/19) が /home に割り当てられます"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "これは 160 GB を超える空き領域がある場合にインストーラが三つのパーティション"
 "を作成することを意味します: / 用に 50 GB, スワップ用に 4 GB, /home 用に残りす"
 "べて"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "UEFI システムをお使いの場合、ESP (EFI システム パーティション) が自動的に検出"
 "され、なければ作成されて /boot/EFI にマウントされます。これが正常に行われたか"
@@ -1727,13 +1763,14 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "GPT ディスクを用いた Legacy (CSM もしくは BIOS) システムをお使いの場合、Bios "
 "ブート パーティションが存在しなければこれを作成する必要があります。これはマウ"
@@ -1742,7 +1779,7 @@ msgstr ""
 "トーラが他のパーティションのようにこれを作成することができます。"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1753,7 +1790,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1762,15 +1799,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "幾つかの新しいドライブは従来の標準である 512 バイトの論理セクタの代わりに "
 "4096 バイトの論理セクタを現在使用しています。利用可能なハードウェアが不足して"
@@ -1781,19 +1819,22 @@ msgstr ""
 "前にドライブのパーティションを設定しておくことを提案します:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"アラインメント\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"前方の空き領域 (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "すべてのパーティションが偶数のメガバイト単位で作成されていることも確認してく"
 "ださい。"
@@ -1804,7 +1845,7 @@ msgid "Installation from LIVE medium"
 msgstr "ライブ メディアからのインストール"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1819,17 +1860,17 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia の公式ドキュメント"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1842,7 +1883,7 @@ msgstr ""
 "可能です。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1854,7 +1895,7 @@ msgstr ""
 "助けを借りて作られました。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1866,13 +1907,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1884,26 +1925,33 @@ msgstr ""
 "ル時の選択内容によって変わります。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "DrakX を用いたインストール"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "2014 年 2 月"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1911,7 +1959,7 @@ msgstr "おめでとうございます"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1920,7 +1968,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1930,16 +1978,17 @@ msgstr ""
 "メディアを取り除いてコンピュータを再起動しても安全です。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "再起動後にブート ローダの画面でお使いのコンピュータ上のオペレーティング シス"
 "テムを選択することができます (複数ある場合)。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1948,12 +1997,12 @@ msgstr ""
 "択されて開始します。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "お楽しみください!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1968,11 +2017,12 @@ msgstr "ファイアウォール"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "このセクションでは幾つかのシンプルなファイアウォール ルールを設定可能にしま"
 "す: これらはインターネットからどの種類のメッセージを対象システムを通して受け"
@@ -1981,15 +2031,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "既定の設定では、どのボタンもチェックされません - システムのどのサービスもネッ"
 "トワークからアクセスできません。\"<emphasis>すべて (ファイアウォールなし)</"
@@ -2001,10 +2052,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "他のすべてのチェック ボタンは多かれ少なかれ分かりやすいものです。例えば、マシ"
 "ン上のプリンタをネットワークからアクセス可能にしたい場合は \"CUPS サーバ\" ボ"
@@ -2017,12 +2069,11 @@ msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "チェック ボタンの集まりは最も一般的なサービスのみを含んでいます。\"上級\" ボ"
 "タンにより、チェック ボタンのないサービスに対応するメッセージを有効にできま"
@@ -2030,12 +2081,12 @@ msgstr ""
 "(空白区切り) を入力することで複数のサービスを有効にできます"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;ポート番号>/&lt;プロトコル></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2046,7 +2097,7 @@ msgstr ""
 "定められています;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2056,7 +2107,7 @@ msgstr ""
 "ターネット プロトコルです。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2065,7 +2116,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis> となります。"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2074,7 +2125,7 @@ msgstr ""
 "2 組を指定します。"
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "フォーマット"
 
@@ -2083,14 +2134,14 @@ msgstr "フォーマット"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2100,23 +2151,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "ここではフォーマットしたいパーティションを選択できます。フォーマット指定をし"
 "て<emphasis>いない</emphasis>パーティション内のデータは残ります。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "通常は少なくとも DrakX が選択したパーティションはフォーマットする必要がありま"
 "す。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2125,12 +2177,13 @@ msgstr ""
 "emphasis>のチェックをしたいパーティションを選択できます。"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "正しい選択をしたか自信がない場合、<guibutton>戻る</guibutton>をクリックして再"
 "度<guibutton>戻る</guibutton>をクリックし、次に<guibutton>カスタム</"
@@ -2138,7 +2191,7 @@ msgstr ""
 "内容を見ることができます。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2146,12 +2199,12 @@ msgstr ""
 "選択に自信があれば、<guibutton>次へ</guibutton>をクリックして先に進みます。"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia インストーラ"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2162,7 +2215,7 @@ msgstr ""
 "に設計されています。"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2171,150 +2224,148 @@ msgstr ""
 "始するもので、通常必要になるのはこれです。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "インストールのようこそ画面"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Mageia の DVD を使用する"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "以下は Mageia の DVD を使用した場合の既定のようこそ画面となり、一つめが UEFI "
 "システムで二つめが Legacy システムのものとなります:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "この画面から、\"e\" の文字を押すと \"編集モード\" に入ってオプションを編集す"
 "ることができます。この画面に戻るには、\"esc\" キーを押して保存せずに終了する"
 "か、\"Ctrl\" もしくは \"F10\" を押して設定を保存して終了します。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "この画面から、幾つかの個人設定を行うことが可能です:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"F2 (Legacy モードのみ) を押すと言語を選択できます (インストール時用で、システ"
-"ム用に選択した言語と異なる可能性があります)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "矢印キーを使用して言語を選択し、Enter キーを押します。"
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"これは例で、フランスのライブ DVD/CD 使用時のようこそ画面です。ライブ DVD/CD "
-"のメニューは以下を提供しないのでご注意ください: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel>, <guilabel>Hardware Detection "
-"Tool</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "矢印キーを使用して言語を選択し、Enter キーを押します。"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "F3 キー (Legacy モードのみ) を押すと画面解像度を変更します。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"legacy モードでは <emphasis role=\"bold\">F6</emphasis> キーを、UEFI モードで"
-"は <emphasis role=\"bold\">e</emphasis> キーをそれぞれ押すことで、幾つかの"
-"カーネル オプションを追加します。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Default, 既定のオプションのまま変更を行いません。"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"インストールに失敗した場合、追加のオプションのいずれかを追加して再試行する必"
-"要があるかもしれません。このメニューは F6 で呼び出され、<guilabel>Boot "
-"options</guilabel> と呼ばれる新しい行を表示して四つのエントリを提供します:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Default, 既定のオプションのまま変更を行いません。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), 電源管理を無効にしま"
 "す。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), CPU の割"
 "り込みについて、必要であればこの項目を選択します。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2323,54 +2374,52 @@ msgstr ""
 "される既定のオプションを変更します。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "幾つかの Mageia のリリースにおいて、F6 キーで選択されたエントリが "
 "<guilabel>Boot Options</guilabel> の行に現れないことがありますが、実際は反映"
 "されています。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"F1 キーを押すと更にカーネル オプションを追加します (Legacy モードのみ)。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "F1 を押すと新しいウィンドウを開き、追加のオプションが利用できます。矢印キーで"
 "項目を選択して Enter を押すと詳細を参照でき、Esc キーを押すとようこそ画面に戻"
 "ります。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "オプション splash についての詳細表示です。Esc を押すか <guilabel>Return to "
 "Boot Options</guilabel> を選択するとオプション一覧に戻ります。これらのオプ"
@@ -2378,19 +2427,22 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "ヘルプは F2 キーで選択された言語に翻訳されています。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2401,80 +2453,47 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "有線ネットワークを使用する"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"下は有線ネットワークを用いたインストール CD (netinstall.iso もしくは "
-"netinstall-nonfree.iso イメージ) 使用時の既定のようこそ画面です:"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"言語の選択はできず、利用可能なオプションは画面に表示されています。有線ネット"
-"ワークを用いたインストール CD の使用についての詳しい情報は <link ns2:href="
-"\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia Wiki</link> を参照して"
-"ください。"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "キーボード レイアウトはアメリカ式となります。"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "インストールのステップ"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "インストール手順は幾つかのステップに分かれており、これらは画面のサイド パネル"
 "上で追うことができます。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "各ステップには一つ以上の画面があり、画面によっては<guibutton>上級</guibutton>"
 "ボタンもあり、これは特別な、あまり使われない項目のためのものです。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "ほとんどの画面には<guibutton>ヘルプ</guibutton>ボタンがあり、現在のステップに"
 "ついての追加の説明を見ることができます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2491,17 +2510,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> を同時に押すと再起動します。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "インストールの問題と解決法"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "グラフィカル インターフェースが表示されない"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2512,13 +2531,16 @@ msgstr ""
 "と入力して低い解像度を試してください。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "ハードウェアが非常に古い場合、グラフィカルなインストールはできない可能性があ"
 "ります。この場合テキスト モード インストールを試してみる価値があります。これ"
@@ -2527,12 +2549,12 @@ msgstr ""
 "それからテキスト モードでインストールを続行します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "インストール時にフリーズする"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2547,14 +2569,15 @@ msgstr ""
 "ます。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM の問題"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2565,18 +2588,20 @@ msgstr ""
 "えば <code>mem=256M</code> は 256MB の RAM を指定します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "ダイナミック パーティション"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Microsoft Windows 上でハード ディスクを \"ベーシック\" 形式から \"ダイナミッ"
 "ク\" 形式に変換済みの場合、このディスクには Mageia をインストールすることはで"
@@ -2596,18 +2621,18 @@ msgstr "更新"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2616,10 +2641,11 @@ msgstr ""
 "パッケージは更新もしくは改善されているでしょう。"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "これらをダウンロードおよびインストールしたい場合は<guilabel>はい</guilabel>"
@@ -2627,8 +2653,9 @@ msgstr ""
 "<guilabel>いいえ</guilabel>を選択します。"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "その後で<guibutton>次へ</guibutton>を押すと続行します。"
 
 #. type: Content of: <section><info><title>
@@ -2685,18 +2712,18 @@ msgstr "メディアの選択 (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2708,7 +2735,7 @@ msgstr ""
 "は次のステップからどのパッケージが選択可能となるかに影響します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2717,7 +2744,7 @@ msgstr ""
 "でいるため、無効化できません。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2732,13 +2759,14 @@ msgstr ""
 "色々な WiFi カードなどのファームウェアを含んでいます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "<emphasis>Tainted</emphasis> リポジトリは自由なライセンスで公開されているパッ"
 "ケージを含んでいます。このリポジトリにパッケージを配置する主な基準は幾つかの"
@@ -2747,38 +2775,41 @@ msgstr ""
 "です。"
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "最小構成インストール"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "パッケージ グループの選択画面ですべてを選択解除することで最小構成インストール"
 "を選択できます。<xref linkend=\"choosePackageGroups\"></xref> をご覧くださ"
 "い。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "お望みであれば、同画面の \"パッケージを個別に選択\" を追加でチェックすること"
 "ができます。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "最小構成のインストールは <application>Mageia</application> をサーバや専門の"
 "ワークステーションといった特定の用途を念頭に置いて使用することが意図されま"
@@ -2787,25 +2818,24 @@ msgstr ""
 "\"choosePackagesTree\"></xref> を参照してください。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "このインストール クラスを選択した場合、関連する画面でドキュメントや X のよう"
 "な有用な追加パッケージを少しインストールすることになるでしょう。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"選択された場合、\"X を使う\" は軽量なデスクトップ環境として IceWM も含むで"
-"しょう。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2819,15 +2849,15 @@ msgstr ""
 "software/coreutils/manual/\">GNU coreutils</link> の info ページを含みます。"
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2844,11 +2874,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX はあなたの選択と DrakX が検出したハードウェアからお使いのシステムの設定"
 "に対して賢い選択を行いました。その設定はここでチェックすることができ、これら"
@@ -2856,9 +2887,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "原則として、既定の設定は推奨され、以下の 3 つの例外を除いて保持することができ"
 "ます:"
@@ -2875,70 +2907,74 @@ msgstr "既定の設定を既に試しているが失敗する場合"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "以下の詳細なセクションで何か他のことが述べられている場合"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "システムのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>タイム ゾーン</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX は指定された言語からタイム ゾーンを選択しています。必要があれば変更する"
 "ことができます。<xref linkend=\"configureTimezoneUTC\"/> も参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>国 / 地域</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "選択されている国にあなたがいない場合、この設定を修正することは非常に重要で"
 "す。<xref linkend=\"selectCountry\"/> を参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>ブート ローダ</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX はブート ローダの設定に対してよい選択をしました。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Grub2 の設定方法をご存知でなければ、何も変更しないでください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "詳しい情報は、<xref linkend=\"setupBootloader\"/> を参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>ユーザの管理</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2947,21 +2983,22 @@ msgstr ""
 "literal> ディレクトリが用意されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>サービス</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "システム サービスとはバックグラウンドで動作するプログラム (デーモン) のことで"
 "す。このツールでは特定のタスクを有効化もしくは無効化できます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2970,32 +3007,33 @@ msgstr ""
 "コンピュータが正しく動作しなくなるかもしれません。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "詳しい情報は、<xref linkend=\"configureServices\"/> を参照してください。"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "ハードウェアのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>キーボード</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "ここではあなたの場所, 言語, キーボード種別に合わせたキーボード配列の設定や変"
 "更を行います。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3004,12 +3042,12 @@ msgstr ""
 "ワードも変更されることになるということを心に留めておいてください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>マウス</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3018,40 +3056,41 @@ msgstr ""
 "り設定したりできます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>サウンド カード</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "インストーラは既定のドライバが存在する場合にこれを使用します。異なるドライバ"
 "を選択するための項目は、お使いのカードに対して複数のドライバが存在する場合に"
 "のみ利用できますが、いずれも既定のドライバとはなりません。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>グラフィカル インターフェース</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "このセクションではお使いのグラフィック カードとディスプレイの設定が可能です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "詳しい情報は、<xref linkend=\"configureX_chooser\"/> を参照してください。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3060,20 +3099,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "ネットワークとインターネットのパラメータ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>ネットワーク</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3083,21 +3123,22 @@ msgstr ""
 "設定したほうがよいでしょう。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "ネットワーク カードを追加する際には、忘れずに同様にファイアウォールを設定して"
 "インターフェースを監視するようにしてください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>プロキシ</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3108,26 +3149,27 @@ msgstr ""
 "るように設定することができます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "ここで入力する必要のあるパラメータを得るためにシステム管理者に相談する必要が"
 "あるかもしれません。"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "セキュリティ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>セキュリティ レベル</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3136,17 +3178,17 @@ msgstr ""
 "の設定 (Standard) が一般的な用途で適切です。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "どの選択肢が最もあなたの用途に適しているかを確認してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>ファイアウォール</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3155,7 +3197,7 @@ msgstr ""
 "なインターネット上の悪い人たちとの間の防壁であると意図されます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3166,7 +3208,7 @@ msgstr ""
 "参照してください。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "すべてを許可すること (ファイアウォールなし) はとても危険になりうるということ"
@@ -3236,39 +3278,73 @@ msgstr ""
 "めの領域を確保するためにどのパーティションを小さくするかを選択します。"
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "セキュリティ レベル"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">パーティションの自動分割:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "ここでセキュリティ レベルを調節できます。"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">上級</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "どれを選択するか分からない場合、既定の設定のままにしておいてください。"
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "セキュリティ設定の調整は、インストール後にいつでも Mageia コントロール セン"
 "ターの<guilabel>セキュリティ</guilabel>で行うことができます。"
@@ -3285,25 +3361,27 @@ msgstr "はじめに"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia は ISO イメージで配布されています。このページはあなたに合っているイ"
 "メージの選択を手助けします。"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "メディアには二つのグループがあります:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "クラシック インストーラ: メディアの起動後に、何をインストールするかや対象シス"
 "テムをどう設定するかを選択できる一連のステップが続きます。これはインストール"
@@ -3311,83 +3389,87 @@ msgstr ""
 "ルするかの選択を提供します。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"ライブ メディア: インストールすることなく実際の Mageia システムでメディアを"
-"ブートすることができ、インストール後の環境を見ることができます。インストール"
-"の過程はよりシンプルですが、選択の幅はより狭くなります。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "詳細は次のセクションで説明します。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "メディア"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "定義"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "ここで、メディアとは Mageia のインストールや更新を行うことを可能にする ISO イ"
 "メージ ファイルのことで、延長線上で考えると ISO ファイルから複製された物理的"
 "なディスクです。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "これらは<link ns4:href=\"http://www.mageia.org/ja/downloads/\">こちら</link>"
 "で見つかります。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "クラシック インストール メディア"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "共通の機能"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "これらの ISO は drakx と呼ばれる伝統的なインストーラを使用します。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "これらはクリーン インストールもしくは以前のリリースからの更新を行うことができ"
 "ます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "32 ビットと 64 ビットのアーキテクチャでメディアは異なります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3396,112 +3478,117 @@ msgstr ""
 "Hardware Detection Tool"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "各 DVD はたくさんの利用可能なデスクトップ環境や言語を含んでいます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "インストール時に非フリーのソフトウェアを追加するか選択することになります。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "ライブ メディア"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "HDD にインストールすることなくこのディストリビューションをプレビューするため"
 "に使用でき、任意でお使いの HDD にインストールすることができます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "各 ISO は一つのデスクトップ環境 (Plasma, GNOME, Xfce) しか含んでいません。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">ライブ ISO はクリーン インストールの際にのみ使用で"
 "き、以前のリリースからのアップグレードに用いることはできません。</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "これらは非フリーのソフトウェアを含んでいます。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "ライブ DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Plasma デスクトップ環境のみとなります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "すべての言語が利用できます。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "64 ビット アーキテクチャ専用です。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "ライブ DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "GNOME デスクトップ環境のみとなります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "64 ビット アーキテクチャ専用です。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "ライブ DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Xfce デスクトップ環境のみとなります。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 ビットと 64 ビットのアーキテクチャに対応しています。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "起動のみの CD メディア"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3513,28 +3600,30 @@ msgstr ""
 "いません。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "これらのメディアは非常に軽量 (100 MB 未満) で、DVD 全体をダウンロードするのに"
 "帯域幅が狭すぎる場合, DVD ドライブのない PC, USB スティックからブートできな"
 "い PC に便利です。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "英語のみとなります。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3568,11 +3657,12 @@ msgstr "ダウンロード"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "ISO ファイルを選択したら、いつでも http もしくは BitTorrent でダウンロードす"
 "ることができます。いずれの場合においても、使用しているミラーや帯域幅が狭すぎ"
@@ -3586,10 +3676,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum と sha1sum は ISO の完全性をチェックするツールです。これらのいずれか一"
 "つだけを使用してください。いずれかを<link linkend=\"integrity\">後で使用する"
@@ -3603,8 +3694,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "ラジオ ボタンを ファイルを保存する にチェックします。"
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3612,14 +3703,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "ダウンロードしたメディアの完全性をチェックする"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "いずれのチェックサムも、ダウンロードしたファイルからアルゴリズムにより計算さ"
 "れた 16 進の数字です。これらのアルゴリズムにあなたがダウンロードしたファイル"
@@ -3628,69 +3720,84 @@ msgstr ""
 "ドをやり直すか BitTorrent で修復を試みたほうがよいということを意味します。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "端末を開きます。root である必要はありません:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- md5sum を使用するには、以下を入力します: [sam@localhost]$ "
 "<userinput>md5sum path/to/the/image/file.iso</userinput>"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- sha1sum を使用するには、以下を入力します: [sam@localhost]$ "
 "<userinput>sha1sum path/to/the/image/file.iso</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"その後、お使いのコンピュータで得られた数字と Mageia により提供される数字とを"
-"比較します (しばらく待つ必要があるかもしれません)。例:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"その後、お使いのコンピュータで得られた数字と Mageia により提供される数字とを"
+"比較します (しばらく待つ必要があるかもしれません)。例:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "ISO を焼くか書き込む"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "チェック済みの ISO は CD や DVD に焼くか、もしくは USB スティックに書き込むこ"
 "とができます。これらの操作は単純なコピーではなく、ブート可能なメディアを作成"
 "しようとするものです。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISO を CD/DVD に焼く"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "お好きなソフトウェアで焼いてください。ただし書き込み先デバイスが<emphasis "
 "role=\"bold\">イメージを焼く</emphasis>ように正しく設定されていることを確認し"
@@ -3699,12 +3806,12 @@ msgstr ""
 "に詳しい情報があります。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "ISO を USB スティックに書き込む"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3714,18 +3821,19 @@ msgstr ""
 "ことを意味します。"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "フラッシュ デバイスへのイメージの \"書き込み\" はデバイス上のすべての既存の"
 "ファイル システムを破壊します; すべての他のデータは失われ、パーティションの容"
 "量はイメージのサイズに縮小されます。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3734,12 +3842,12 @@ msgstr ""
 "マットしなければなりません。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Mageia 内でグラフィカル ツールを使用する"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3749,73 +3857,72 @@ msgstr ""
 "フィカル ツールを使用できます。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Windows 内でグラフィカル ツールを使用する"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "以下を試すことができます:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> では "
 "\"ISO image\" を使用します;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "GNU/Linux システム内でコマンド ラインを使用する"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "これを手動で行うことは潜在的に *危険* です。デバイス ID を間違えるとディスク"
 "のパーティションを上書きするおそれがあります。"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "端末で dd ツールを使用することもできます:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "端末を開きます"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "<userinput>su -</userinput> コマンドで root になります (最後の '-' を忘れない"
 "でください)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3825,28 +3932,41 @@ msgstr ""
 "いうことも意味します)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "コマンド <userinput>fdisk -l</userinput> を入力します"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
+msgid ""
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"お使いの USB スティックのデバイス名を探します (サイズを参考にします)。例えば"
+"上のスクリーンショットでは <code>/dev/sdb</code> で、8GB の USB スティックで"
+"す。"
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "代わりに、<code>dmesg</code> コマンドでデバイス名を取得することができます: 末"
 "尾に <emphasis>sd</emphasis> で始まるデバイス名が見え、この場合は "
 "<emphasis>sdd</emphasis> です:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3888,47 +4008,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"お使いの USB スティックのデバイス名を探します (サイズを参考にします)。例えば"
-"上のスクリーンショットでは <code>/dev/sdb</code> で、8GB の USB スティックで"
-"す。"
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "コマンドを入力します: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "X はお使いのデバイス名で、例えば: /dev/sdc です"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "例: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/"
 "sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "コマンドを入力します: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "USB スティックを抜きます、これで完了です"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3958,19 +4086,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "あなたのいる国が一覧にない場合、<guilabel>他の国</guilabel>ボタンをクリックし"
 "てそこで国や地域を選択します。"
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "あなたのいる国が<guilabel>他の国</guilabel>の一覧にしかない場合、"
@@ -3979,18 +4109,19 @@ msgstr ""
 "択に従うでしょう。"
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "入力メソッド"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "<guilabel>他の国</guilabel>画面では入力メソッドも選択できます (一覧の下)。入"
@@ -4000,66 +4131,67 @@ msgstr ""
 "の前に HTTP/FTP のメディアを追加した場合にインストールできます。"
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "入力メソッドの設定をインストール時にし損ねた場合、インストール済みのシステム"
 "をブート後に \"コンピュータを設定\" -> \"システム\" を通じて、もしくは root "
 "として localedrake を実行することでアクセスできます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "インストールもしくはアップグレードを行う"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "インストール"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"<application>Mageia</application> を一からインストールするにはこの選択肢を使"
-"用します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "アップグレード"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"<application>Mageia</application> が一つ以上インストールされている場合、イン"
-"ストーラはそのいずれかを最新のリリースにアップグレードすることができます。"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "このインストーラのバージョンが公開された時点で<emphasis>サポートが継続してい"
 "る</emphasis>過去の Mageia のバージョンからのアップグレードのみが十分にテスト"
@@ -4068,16 +4200,17 @@ msgstr ""
 "ンを保持しつつクリーン インストールを行うのがよりよいでしょう。"
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "インストール中にこれを中止しようと決めた場合、再起動してもかまいませんが、そ"
 "の前に二度考えてください。いったんパーティションがフォーマットされたりインス"
@@ -4088,12 +4221,14 @@ msgstr ""
 "Delete</guibutton> を同時に押すと再起動します。"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "追加の言語を選択し忘れたことに気づいた場合、<guilabel>Alt Ctrl Home</"
 "guilabel> を押すことで \"インストールもしくはアップグレードを行う\" の画面か"
@@ -4127,12 +4262,12 @@ msgstr ""
 "列はあなたが以前選択した言語やタイム ゾーンによって選択されます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "キーボード"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4141,16 +4276,17 @@ msgstr ""
 "ボードが見つからない場合はアメリカ式のキーボード配列が既定になります。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4167,22 +4303,24 @@ msgstr ""
 "org/wiki/キー配列</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "表示される一覧にお使いのキーボードがない場合、<guibutton>詳細</guibutton>をク"
 "リックして完全な一覧を表示し、そこでお使いのキーボードを選択します。"
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "<guibutton>詳細</guibutton>ダイアログからキーボードを選択した後、最初のキー"
 "ボード選択に戻り、その画面からキーボードが選択されたように見えます。このおか"
@@ -4190,22 +4328,23 @@ msgstr ""
 "ドは完全な一覧から選択されたものです。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "非ラテン文字に基づくキーボードを選択した場合、ラテンと非ラテンのキーボード配"
 "列をどのように切り替えたいかを質問する追加のダイアログが表示されます。"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "使用する言語を選択する"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4216,7 +4355,7 @@ msgstr ""
 "ムにこの選択を適用します。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4225,12 +4364,13 @@ msgstr ""
 "間とインストール後のシステムにこの選択を適用します。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "幾つかの言語がインストールされている必要がありそうな場合、あなた自身と他の"
 "ユーザのために、<guibutton>複数の言語</guibutton>ボタンを使用してここでそれら"
@@ -4238,7 +4378,7 @@ msgstr ""
 "す。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4251,18 +4391,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "複数の言語を選択した場合であっても、はじめに最初の言語の画面でいずれかの言語"
 "をお好みの言語として選ばなければなりません。これは複数の言語の画面でも選択済"
 "みとマークされるでしょう。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4271,23 +4412,24 @@ msgstr ""
 "インストールするのが望ましいです。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia は既定で UTF-8 (Unicode) をサポートしています。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "これはあなたの言語で適切でないと分かっている場合に \"複数の言語\" 画面で無効"
 "にすることができます。UTF-8 を無効にするとすべてのインストール済みパッケージ"
 "に適用されます。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4340,71 +4482,76 @@ msgstr ""
 "選択すると、六つ以上のボタンのあるマウスで動作しないボタンを設定します。"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "ブート メニュー項目を追加もしくは変更する"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "これを行うためには、/boot/grub2/custom.cfg を手動で編集する必要があります。も"
 "しくはソフトウェア grub-customizer (Mageia のリポジトリで利用できます) を代わ"
 "りに使用します。"
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "詳しい情報は、私たちの wiki を参照してください: <link ns2:href=\"https://"
 "wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "ブート ローダの主な設定"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "ブート ローダのインターフェース"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "既定では、Mageia は以下のいずれかを排他的に使用します:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Legacy/MBR もしくは Legacy/GPT システム用の Grub2 (グラフィカル メニューあり"
 "となし)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "UEFI システム用の Grub2-efi"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia のグラフィカル メニューは良いですね :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Legacy/MBR と Legacy/GPT システム上の Grub2"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4417,29 +4564,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "\"起動デバイス\" は何をしているのか本当に分かっているのでなければ変更しないで"
 "ください。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "UEFI システム上の Grub2-efi"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "UEFI システムでは、ユーザ インターフェースはわずかに異なり、グラフィカル メ"
 "ニューのありとなしを選択することはできません。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4452,14 +4604,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "お使いのコンピュータにインストールされているシステムが Mageia のみとなる場"
@@ -4471,38 +4624,43 @@ msgstr ""
 "分なので、一つにすることをおすすめします。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Mageia のブート ローダを使用する"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 "既定では、お使いのシステムによって、Mageia は新しいブート ローダを書き込みま"
 "す:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 ブート ローダを最初のハード ドライブの MBR (マスタ ブート レコード) も"
 "しくは BIOS ブート パーティション内に書き込みます。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi ブート ローダを ESP に書き込みます。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "既に他のオペレーティング システムがインストールされている場合、Mageia はこれ"
 "らを新しい Mageia のブート メニューに追加しようとします。この動作を希望しない"
@@ -4510,7 +4668,7 @@ msgstr ""
 "る</guilabel>のチェックを外します。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4523,18 +4681,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "既存のブート ローダを使用する"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "お使いの Mageia システムを既存のブート ローダに追加する正確な手順はこのヘルプ"
 "で扱う範囲外ですが、これはほとんどの場合においてそれの検出と追加を自動的に"
@@ -4543,23 +4702,24 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "チェイン ロードを使用する"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Mageia をブート可能にせず、他の OS からチェイン ロードしたい場合、<guibutton>"
 "次へ</guibutton>をクリックし、次に<guibutton>上級</guibutton>をクリックして "
 "<guilabel>ESP や MBR に書き込まない</guilabel>にチェックします。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4572,7 +4732,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4581,7 +4741,7 @@ msgstr ""
 "guibutton> をクリックします。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4590,33 +4750,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "設定項目"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "最初のページ"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>既定のイメージが起動するまでの秒数</guilabel>: このテキスト ボック"
 "スは既定のオペレーティング システムが開始する前に空ける秒数を設定するもので"
 "す。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>セキュリティ</guilabel>: これはブート ローダ用のパスワードを設定で"
 "きるようにします。これはブート時に項目を選択したり設定を変更したりするために"
@@ -4624,37 +4785,37 @@ msgstr ""
 "ワードは後でここで選択したものです。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>パスワード</guilabel>: このテキスト ボックスは実際にパスワードを入"
 "力する場所です"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>パスワード (再入力)</guilabel>: パスワードを再入力し、Drakx は上の"
 "パスワードと一致するかをチェックします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>上級</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI を有効にする</guilabel>: ACPI (Advanced Configuration and "
 "Power Interface) は電源管理の標準です。これは使用されていないデバイスを停止す"
@@ -4664,21 +4825,22 @@ msgstr ""
 "場合です (例えばランダムに再起動が起こったりシステムが固まったりする場合)。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP を有効にする</guilabel>: この項目はマルチ コア プロセッサで対称"
 "型マルチ プロセッシングを有効化 / 無効化します。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC を有効にする</guilabel>: これを有効化もしくは無効化すると "
 "Advanced Programmable Interrupt Controller へのオペレーティング システムのア"
@@ -4686,28 +4848,29 @@ msgstr ""
 "み要求) の管理を可能にします。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>ローカル APIC を有効にする</guilabel>: ここでローカル APIC を設定で"
 "き、これは SMP システムにおいて特定のプロセッサに対するすべての外部割り込みを"
 "管理します。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "次のページ"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>既定値</guilabel>: 開始する既定のオペレーティング システムです。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4716,7 +4879,7 @@ msgstr ""
 "たにより多くの情報を渡すようにカーネルに伝えたりします。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4726,18 +4889,19 @@ msgstr ""
 "ださい。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>ビデオ モード</guilabel>: これはブート メニューが用いる画面のサイズ"
 "と色深度を設定します。下向きの三角形をクリックするとサイズと色深度の他の項目"
 "が表示されます。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4747,7 +4911,7 @@ msgstr ""
 "さい。"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI を設定する"
 
@@ -4760,36 +4924,39 @@ msgstr "SCSI を設定する"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX は通常正しくハード ディスクを検出します。幾つかの古い SCSI コントローラ"
 "では正しいドライバを特定することができずにその後ドライブの認識に失敗するかも"
 "しれません。"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "そうなった場合、手動で Drakx にどの SCSI ドライブをお使いかを手動で知らせる必"
 "要があるでしょう。"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "そうすれば DrakX はドライブを正しく設定できるはずです。"
 
@@ -4810,10 +4977,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "この画面ではお使いのサウンド カード向けにインストーラが選択したドライバの名前"
 "が表示され、これは既定のドライバがある場合にはそのドライバとなるでしょう。"
@@ -4835,42 +5002,47 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "次に、draksound もしくは \"サウンドの設定\" ツールの画面で、<guibutton>上級</"
 "guibutton>をクリックして次に<guibutton>トラブルシューティング</guibutton>をク"
 "リックすると、問題を解決するための非常に有用なアドバイスが見つかります。"
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "上級"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "この画面で<guibutton>上級</guibutton>をクリックすると、インストール時には、既"
 "定のドライバがなく利用可能なドライバが複数存在する場合に有用ですが、インス"
 "トーラが間違ったドライバを選択したと考えられる場合は除きます。"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "その場合、<guibutton>任意のドライバを選択</guibutton>をクリック後に異なるドラ"
 "イバを選択することができます。"
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "ハード ディスクをフォーマットするか確認する"
 
@@ -4881,13 +5053,13 @@ msgstr "ハード ディスクをフォーマットするか確認する"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4897,16 +5069,19 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr "選択に自信がなければ<guibutton>戻る</guibutton>をクリックします。"
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "選択に自信があり、ハード ディスク上のすべてのパーティション, すべてのオペレー"
 "ティング システム, すべてのデータを削除したいのであれば<guibutton>次へ</"
@@ -5031,16 +5206,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia をアンインストールする"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "方法"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Mageia があなたを納得させなかったか、もしくはあなたがこれを正しくインストール"
@@ -5048,28 +5219,30 @@ msgstr ""
 "たの権利であり、Mageia はアンインストールの可能性の提供も行います。これはすべ"
 "てのオペレーティング システムには当てはまりません。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "データをバックアップした後、インストール メディア DVD を再起動して Rescue "
 "system を選択し、次に、Restore Windows boot loader を選択します。次のブート"
 "時、オペレーティング システムの選択はなくなって Windows だけになっているで"
 "しょう。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Mageia のパーティションとして使用されていた領域を Windows 上で復旧するには、"
 "<code>スタート -> コントロール パネル -> 管理ツール -> コンピューターの管理 -"
@@ -5079,8 +5252,8 @@ msgstr ""
 "う。各パーティションで右クリックして<guibutton>削除</guibutton>を選択します。"
 "この領域は解放されるでしょう。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5088,14 +5261,15 @@ msgstr ""
 "Windows XP をお使いの場合、新しいパーティションを作成してそれをフォーマットで"
 "きます (FAT32 もしくは NTFS)。パーティションのドライブ文字が付くでしょう。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Vista もしくは 7 をお持ちの場合、もう一つの可能性があり、解放された領域の左に"
 "ある既存のパーティションを拡張することができます。gparted のような、windows "
@@ -5147,3 +5321,330 @@ msgid ""
 msgstr ""
 "次の段階はハード ディスク上のファイルのコピーです。これには数分かかります。最"
 "後に、少しだけ画面が黒くなりますが、これは正常です。"
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>パスワード (再入力)</guilabel>: 再びユーザのパスワードをこのテキ"
+#~ "スト ボックスに入力します。drakx はユーザ パスワードの両方のテキスト ボッ"
+#~ "クスに同じパスワードを入力したかをチェックします。"
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "更に、ゲスト アカウントを無効化もしくは有効化することが可能です。"
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "既定のゲスト アカウント <emphasis>rbash</emphasis> が自分の /home ディレク"
+#~ "トリ内に保存したものはログアウト時に削除されます。このゲストは大事なファイ"
+#~ "ルを USB キーに保存するのがよいでしょう。"
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>ゲスト アカウントを有効にする</guilabel>: ここでゲスト アカウン"
+#~ "トを有効化もしくは無効化することができます。このゲスト アカウントは来客を"
+#~ "この PC にログインして使用できるようにしますが、通常のユーザよりも権限が限"
+#~ "られています。"
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>グループ ID</guilabel>: グループ ID が設定できます。これも数字"
+#~ "で、通常はユーザ ID と同じ値です。何をしているのか分かっているのでなければ"
+#~ "空欄のままにしてください。"
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"デバイス\" は以下で構成されます: \"ハード ドライブ\", [\"ハード ドライブ"
+#~ "番号\"(文字)], \"パーティション番号\" (例 \"sda5\")"
+
+#~ msgid "Workstation."
+#~ msgstr "ワークステーション"
+
+#~ msgid "Server."
+#~ msgstr "サーバ"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "グラフィカル環境"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "四つのグループがあり、グループの前にある三角形をクリックすると展開され、そ"
+#~ "の中のすべてのサービスが見えるようになります。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "お使いのカードがベンダ一覧にない場合 (データベースに未登録か古いカード) "
+#~ "は Xorg カテゴリから適したドライバが見つかるかもしれません。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "検出されたハード ディスクや他の USB キーのようなストレージ デバイスごとに"
+#~ "タブが存在します。例えば三つのデバイスがある場合は sda, sdb, sdc となりま"
+#~ "す。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "インストーラは利用可能な場所を以下のルールに従って分割します:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"アラインメント\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"前方の空き領域 (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "この画面から、幾つかの個人設定を行うことが可能です:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "F2 (Legacy モードのみ) を押すと言語を選択できます (インストール時用で、シ"
+#~ "ステム用に選択した言語と異なる可能性があります)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "これは例で、フランスのライブ DVD/CD 使用時のようこそ画面です。ライブ DVD/"
+#~ "CD のメニューは以下を提供しないのでご注意ください: <guilabel>Rescue "
+#~ "System</guilabel>, <guilabel>Memory test</guilabel>, <guilabel>Hardware "
+#~ "Detection Tool</guilabel>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "legacy モードでは <emphasis role=\"bold\">F6</emphasis> キーを、UEFI モー"
+#~ "ドでは <emphasis role=\"bold\">e</emphasis> キーをそれぞれ押すことで、幾つ"
+#~ "かのカーネル オプションを追加します。"
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "インストールに失敗した場合、追加のオプションのいずれかを追加して再試行する"
+#~ "必要があるかもしれません。このメニューは F6 で呼び出され、<guilabel>Boot "
+#~ "options</guilabel> と呼ばれる新しい行を表示して四つのエントリを提供します:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "F1 キーを押すと更にカーネル オプションを追加します (Legacy モードのみ)。"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "有線ネットワークを使用する"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "下は有線ネットワークを用いたインストール CD (netinstall.iso もしくは "
+#~ "netinstall-nonfree.iso イメージ) 使用時の既定のようこそ画面です:"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "言語の選択はできず、利用可能なオプションは画面に表示されています。有線ネッ"
+#~ "トワークを用いたインストール CD の使用についての詳しい情報は <link ns2:"
+#~ "href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia Wiki</link> を"
+#~ "参照してください。"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "キーボード レイアウトはアメリカ式となります。"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "選択された場合、\"X を使う\" は軽量なデスクトップ環境として IceWM も含むで"
+#~ "しょう。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "ここでセキュリティ レベルを調節できます。"
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "どれを選択するか分からない場合、既定の設定のままにしておいてください。"
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "ライブ メディア: インストールすることなく実際の Mageia システムでメディア"
+#~ "をブートすることができ、インストール後の環境を見ることができます。インス"
+#~ "トールの過程はよりシンプルですが、選択の幅はより狭くなります。"
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "起動のみの CD メディア"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "ラジオ ボタンを ファイルを保存する にチェックします。"
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "端末で dd ツールを使用することもできます:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "USB スティックを抜きます、これで完了です"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "<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."
+#~ msgstr ""
+#~ "<application>Mageia</application> が一つ以上インストールされている場合、イ"
+#~ "ンストーラはそのいずれかを最新のリリースにアップグレードすることができま"
+#~ "す。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "方法"
diff --git a/docs/docs/stable/installer/nb.po b/docs/docs/stable/installer/nb.po
index a1ed6092..15d9da9b 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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-14 13:18+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -26,12 +26,13 @@ msgstr "Lisens og utgivelsesmerknader"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -64,8 +65,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "For å akseptere, velg <guilabel>Aksepter</guilabel>  og klikk på "
@@ -87,9 +89,10 @@ msgstr "Utgivelsesmerknader"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Viktig informasjon finnes for denen utgivelsen av <application>Mageia</"
@@ -97,13 +100,13 @@ msgstr ""
 "guibutton> knappen."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "nb"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Mediumvalg (sett opp supplerende installasjonsmedia)"
 
@@ -111,23 +114,25 @@ msgstr "Mediumvalg (sett opp supplerende installasjonsmedia)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Denne skjermen viser deg en liste over alle brønner som er funnet. Du kan "
 "legge til andrepakke kilder, som feks en optisk disk eller en fjernkilde."
@@ -135,23 +140,25 @@ msgstr ""
 "stegene"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "For en nettverkskilde følger det to steg:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Valg av og aktivering av nettverket hvis det ikke allerede er oppe."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Veg et speil eller spesifiser en URL. Ved å velge et speil fra listen over "
 "tilgjengelige speil, som feks Nonfree (inneholder proprietær programvare) "
@@ -160,14 +167,15 @@ msgstr ""
 "installasjon."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Hvis du oppdaterer en 64-biters installasjon som kan inneholde noen 32-"
 "biters pakker, anbefales det å bruke dette skjermbildet for å legge til et "
@@ -183,7 +191,7 @@ msgstr "Administrasjon av Brukere og superbrukere"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -196,21 +204,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Angi Adminstrasjons (root) Passord:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Det anbefales at alle Mageia-installasjoner angir en superbruker eller "
 "administratorens passord, vanligvis kalt rotpassordet i Linux. Når du "
@@ -221,32 +229,35 @@ msgstr ""
 "mistypet det første passordet ved å sammenligne dem."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Alle passord er tegnfølsomme, det er best å 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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Angi en bruker"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Legg til en bruker her. En bruker har færre rettigheter enn superbrukeren "
 "(rot), men nok til å bruke internett, kontorapplikasjoner eller spill og alt "
 "annet som den gjennomsnittlige brukeren gjør med sin datamaskin"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -255,7 +266,7 @@ msgstr ""
 "brukerikonet endres."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -264,10 +275,11 @@ msgstr ""
 "tekstboksen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Login Navn</guilabel>: Her skriver du inn brukernavnet eller lar "
@@ -275,40 +287,42 @@ msgstr ""
 "case sensitiv.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Passord</guilabel>: I denen tekstboksen skriver du inn brukerens "
 "passord. Det er et skjold som viser styrken på passordet ved siden av "
 "tekstsfeltet. (Se også <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Passord (igjen)</guilabel>: Skriv inn brukerpassordet på nytt i "
-"denne tekstboksen, og drakx vil kontrollere at du har samme passord i hver "
-"av tekstboksene."
+"<guilabel>Passord (igjen)</guilabel>: Skriv inn passordet igjen, og Drakx "
+"vil kontrollere at det samsvarer med det som er angitt ovenfor."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Enhver bruker du legger til mens du installerer Mageia, vil ha en både lese "
 "og skrivebeskyttet hjemmekatalog (umask = 0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -317,85 +331,58 @@ msgstr ""
 "Velg<emphasis>Brukerhåndtering</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Tilgangstillatelsene kan også endres etter installasjonen."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Avansert brukeradministrasjon"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Hvis <guibutton>avansert</guibutton> knappen er trykket, vises et "
 "skjermbilde der du kan endre dataene for brukeren du legger til."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "I tillegg kan du deaktivere eller aktivere en gjestekonto."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Alt som en bruker med en standard <emphasis>rbash</emphasis> gjestekonto "
-"lagrer til sitt hjemmeområde vil bli automatisk slettet ved utlogging. "
-"Gjestebrukeren bør lagre sine viktige filer på en USB pinne."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Aktiver gjestekonto</guilabel>: Her kan du aktivere eller "
-"deaktivere en gjestekonto. Gjestekontoen lar en gjest logge inn og bruke "
-"PCen med mindre rettigheter en normale brukere."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Skall</guilabel>: I nedtrekslisten kan du endre skallet som brukes "
 "av  brukeren. Tilgjengelige skall er, Bash, Dash og Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Bruker ID</guilabel>: Her kan du angi bruker ID for den brukeren "
 "du legger til. Dette er et nummer. La det stå tomt dersom du ikke vet hva du "
 "gjør."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Gruppe ID</guilabel>: Her angir du gruppe id, som også er et "
-"nummer. Normalt er dette det samme som bruker ID. La det stå tomt om du ikke "
-"vet hva du gjør."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Velg monteringspunktene"
 
@@ -412,13 +399,14 @@ msgstr "Velg monteringspunktene"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -428,7 +416,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -439,41 +427,45 @@ msgstr ""
 "monterings punktene"
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Hvis du endrer noe, pass på at du fortsatt har en <literal>/</literal> (rot) "
 "partisjon."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Alle partisjoner vises slik: \"Enhet\" (\"Kapasitet\", \"Monteringspunkt\", "
 "\"Type\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Enhet\", består av: \"disk\", [\"disk nummer\"(bokstav)], "
-"\"partisjonsnummer\" (f.eks,\"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Hvis du har flere partisjoner, kan du sette opp flere monteringspunkter fra "
 "nedtrekksmenyen, som <literal>/</literal>, <literal>/home</literal> og "
@@ -484,20 +476,22 @@ msgstr ""
 "installasjon."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "For partisjoner trenger som du ikke  behøver å ha tilgang til, du kan la "
 "feltet for monteringspunkt være tomt."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Velg <guibutton>Forrige</guibutton> hvis du ikke vet hva du skal velge og "
 "marker for Egendefinert diskpartisjonering.<guilabel>Egendefinert disk "
@@ -505,7 +499,7 @@ msgstr ""
 "partisjon og se størrelse og type."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -770,8 +764,9 @@ msgstr "Skrivebordsvalg"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Avhengig av ditt valg her, kan du få opp ytterligere skjermbilder for å "
@@ -779,8 +774,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -799,14 +795,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Velg om du foretrekker å bruke <application>KDE</application> eller "
 "<application>Gnome</application> skrivebordsmiljø. Begge kommer med en "
@@ -833,8 +831,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -846,62 +845,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Arbeidsstasjon"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Sett opp partisjonsstørrelser:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafisk miljø"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuelt pakkevalg. Du kan bruke dette alternativet for manuelt å legge "
 "till eller fjerne pakker."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Les <xref linkend=\"minimal-install\"/> for instruksjoner om hvordan du kan "
 "gjøre en minimum installasjon (uten eller med X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Individuelt pakkevalg"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Her kan du legge til eller fjerne tilleggspakker for å tilpasse "
 "installasjonen din."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -916,47 +922,45 @@ msgstr ""
 "installasjonen og velge å laste inn den."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfigurer tjenestene dine"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "her kan du angi hvilke tjenester som skal (eller skal ikke) når du starter "
 "systemet."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Det er fire grupper, klikk på trekanten foran en gruppe for å ekspandere "
-"gruppen slik at alle inngående tjenester vises."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Parametrene som DrakX velger er som regel gode."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -964,7 +968,7 @@ msgstr ""
 "Når du markerer en tjeneste, vil det vises mer informasjon  i boksen under."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Du bør bare endre ting når vet veldig godt hva du gjør."
 
@@ -977,12 +981,13 @@ msgstr "Sett opp tidssonen din"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -992,18 +997,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "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
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "I det neste skjermbildet kan du velge å sette maskinvareklokken til lokal "
 "tid eller GMT, også kjent som UTC."
@@ -1018,23 +1025,23 @@ msgstr ""
 "til samme lokaltid eller UTC."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Velg en X-tjener (Konfigurer grafikk kortet ditt)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1043,7 +1050,7 @@ msgstr ""
 "identifisere videoenheten riktig."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1052,100 +1059,97 @@ msgstr ""
 "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:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "Leverandør"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "angi så navnet på kortet ditt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "og korttypen"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Hvis du ikke finner kortet ditt i leverandørlisten (fordi det ikke er i "
-"databasen eller det er et eldre kort), kan du finne en passende driver i "
-"kategorien Xorg."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg-oppføringen har mer enn 40 generiske og åpen kildekode-kortdrivere. "
 "Hvis du fremdeles ikke kan finne en navngitt driver for kortet ditt, er det "
 "mulig å bruke vesa-driveren som gir grunnleggende funksjoner."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Vær oppmerksom på at hvis du velger en inkompatibel driver, kan du kanskje "
 "bare få tilgang til kommandolinjegrensesnittet."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Enkelte skjermkortprodusenter tilbyr proprietære drivere for Linux, som bare "
 "kan være tilgjengelige i Nonfree-depotet og i enkelte tilfeller bare fra "
 "kortprodusenteres nettsteder."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree-depotet må eksplisitt aktiveres for å få tilgang til det. Hvis du "
 "ikke valgte det tidligere, bør du gjøre dette etter første omstart."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Uansett hvilket grafisk miljø (også kjent som skrivebordsmiljø) du valgte "
 "for denne installasjonen av<application>Mageia</application>, de er alle "
@@ -1157,7 +1161,7 @@ msgstr ""
 "ikke satte verdiene korrekt."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1166,13 +1170,14 @@ msgstr ""
 "fra listen om nødvendig."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Skjerm</guibutton></emphasis>: Du kan velge "
 "<guilabel>Plug'n Play</guilabel> når det passer eller velg skjermen fra "
@@ -1181,30 +1186,31 @@ msgstr ""
 "og vertikal oppdateringshastighet på skjermen manuelt."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Feil oppdateringsfrekvens kan skade skjermen"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Oppløsning</guibutton></emphasis>: Still inn ønsket "
 "oppløsning og fargedybde på skjermen din her."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Testknappen vises ikke "
 "alltid under installasjonen. Hvis knappen er der, kan du kontrollere "
@@ -1215,7 +1221,7 @@ msgstr ""
 "innstillingene er korrekte hvis testknappen ikke er tilgjengelig</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1224,12 +1230,12 @@ msgstr ""
 "aktivere eller deaktivere ulike alternativer."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Velg en monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1238,35 +1244,36 @@ msgstr ""
 "identifisere dine korrekt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Å velge en skjerm med forskjellige egenskaper kan skade skjermen "
 "eller videomaskinvaren. Vennligst ikke prøv noe uten å vite hva du gjør.</"
 "emphasis> Hvis du er i tvil, bør du konsultere skjermdokumentasjonen"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Tilpasset</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1279,7 +1286,7 @@ msgstr ""
 "synkronisering er frekvensen der skannelinjer vises."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1292,12 +1299,12 @@ msgstr ""
 "skjermdokumentasjonen."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1306,12 +1313,12 @@ msgstr ""
 "skjermdatabasen."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Leverandør</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1320,28 +1327,30 @@ msgstr ""
 "har, kan du velge den fra treet ved å velge:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "skjermens produsent"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "skjermbeskrivelse"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generisk</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Hvis du velger denne gruppen, vises nesten 30 visningskonfigurasjoner som "
 "1024x768 @ 60Hz og inkluderer flatskjerm-skjermer som brukes i bærbare "
@@ -1350,12 +1359,12 @@ msgstr ""
 "kan det være lurt å være konservativ i valgene dine."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Egendefinert partisjonering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1366,12 +1375,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Hvis du ønsker å kryptere <literal>/</literal> partisjonen din, må du "
 "forsikre deg om at du har en separat <literal>/boot</literal> partisjon. "
@@ -1379,42 +1390,44 @@ msgstr ""
 "Systemet vil i så fall  ikke bli mulig å starte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Juster utformingen av disken din her. Du kan fjerne eller opprette "
 "partisjoner, endre filsystemet til en partisjon eller endre størrelsen og "
 "til og med se hva som er i dem før du starter."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Det finnes en fane for hver oppdaget harddisk eller annen lagringsenhet, som "
-"en USB-nøkkel. For eksempel sda, sdb og sdc hvis det er tre av dem."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Trykk <guibutton>Fjern alle</guibutton>  for å slette alle partisjonen på "
 "disken."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "For alle andre handlinger: Klikk først på ønsket partisjon. Deretter ser du "
 "det, eller velg et filsystem og et monteringspunkt, endre størrelsen på det "
@@ -1423,32 +1436,34 @@ msgstr ""
 "lage en etikett eller velge en partisjonstype."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Fortsett til du har justerert alt etter dine ønsker."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: 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><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "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:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1456,12 +1471,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1470,7 +1485,7 @@ msgstr ""
 "en BIOS-oppstartspartisjon er tilstede og av riktig type"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1483,32 +1498,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partisjonering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "På denne skjermen kan du se innholdet på harddisken din og se løsningene som "
 "DrakX partisjoneringsveiviseren fant for å installere<application>Mageia</"
 "application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "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:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1521,12 +1538,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Bruk gamle partisjoner"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1535,12 +1552,12 @@ msgstr ""
 "partisjoner blitt funnet og kan brukes til installasjonen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Bruk ledig plass"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1549,12 +1566,12 @@ msgstr ""
 "din nye Mageia-installasjon."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Bruk ledig plass på Microsoft Windows®-partisjonen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1563,7 +1580,7 @@ msgstr ""
 "installasjonen tilby å bruke den."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1574,7 +1591,7 @@ msgstr ""
 "sikkerhetskopiert alle viktige filer!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1590,12 +1607,14 @@ msgstr ""
 "brukes. Det anbefales å sikkerhetskopiere dine personlige filer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Med dette alternativet viser installasjonen den gjenværende Windows-"
 "partisjonen i lyseblå og den fremtidige Mageia-partisjonen i mørkeblå med de "
@@ -1604,36 +1623,38 @@ msgstr ""
 "skjermbildet nedenfor."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Slett og bruk hele disken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Dette alternativet vil bruke hele disken for Mageia"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Merk! Dette vil slette ALLE data på den valgte harddisken. Vær forsiktig!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1644,12 +1665,12 @@ msgstr ""
 "dette alternativet."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Egendefinert partisjonering"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1658,67 +1679,82 @@ msgstr ""
 "harddisken(e) din."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Sett opp partisjonsstørrelser:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "Installasjonen vil dele tilgjengelig plass etter følgende regler:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Hvis det totale tilgjengelige stedet er mindre enn 50 GB, opprettes kun en "
 "partisjon for /, det er ingen separat partisjon for / hjemme."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Hvis den totale tilgjengelige plassen er over 50 GB, blir tre partisjoner "
 "opprettet"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 av den totale tilgjengelige plassen er tildelt / med maksimalt 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 er allokert til vekslingspartisjon med maksimalt 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "resten (minst 12/19) er tildelt / home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Det betyr at fra 160 GB og over tilgjengelig plass, vil installasjonen "
 "opprette tre partisjoner: 50 GB for /, 4 GB for bytte og resten for / home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Hvis du bruker et UEFI-system, vil ESP (EFI System Partition) automatisk bli "
 "oppdaget, eller opprettet hvis den ikke eksisterer ennå, og montert på / "
@@ -1726,13 +1762,14 @@ msgstr ""
 "gjør det mulig å sjekke at det er gjort riktig"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Hvis du bruker et Legacy-system (kjent som CSM eller BIOS) med en GPT-disk, "
 "må du opprette en Bios-oppstartspartisjon hvis den ikke allerede eksisterer. "
@@ -1741,7 +1778,7 @@ msgstr ""
 "partisjoner, velg bare BIOS boot partisjon som filsystemtype."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1752,7 +1789,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1761,15 +1798,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Noen nyere disker bruker nå 4096 byte logiske sektorer, i stedet for den "
 "forrige standarden på 512 byte logiske sektorer. På grunn av mangel på "
@@ -1780,19 +1818,22 @@ msgstr ""
 "som gparted, hvis du har en slik enhet, og bruker følgende innstillinger:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Juster til\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Fri plass foran (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Pass også på at alle partisjoner er opprettet med et jevnt antall megabyte."
 
@@ -1802,7 +1843,7 @@ msgid "Installation from LIVE medium"
 msgstr "Installerer fra LIVE medium"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1817,18 +1858,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageias Offisielle dokumentasjon"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1840,7 +1881,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1852,7 +1893,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1864,13 +1905,13 @@ msgstr ""
 "link>, hvis du vil hjelpe til med å forbedre denne manualen."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1882,26 +1923,34 @@ msgstr ""
 "gjør under installasjonen."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installasjon med DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februar 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1909,7 +1958,7 @@ msgstr "Gratulerer"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1918,7 +1967,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1929,16 +1978,17 @@ msgstr ""
 "datamaskinen på nytt."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Etter at du har startet på nytt, kan du velge mellom operativsystemene på "
 "datamaskinen din (hvis du har mer enn én) ."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1947,12 +1997,12 @@ msgstr ""
 "installasjonen automatisk valgt og startet."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Nyt!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1965,11 +2015,12 @@ msgstr "Brannmur"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Denne delen gjør det mulig å konfigurere noen enkle brannmurregler: de "
 "bestemmer hvilken type melding fra Internett som skal aksepteres av "
@@ -1978,15 +2029,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "I standardinnstillingen er ingen knapp aktivert - ingen tjeneste av systemet "
 "er tilgjengelig fra nettverket. \"<emphasis>Alt (ingen brannmur)</emphasis>"
@@ -1998,10 +2050,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Alle de andre boksene er mer eller mindre selvforklarende. Som et eksempel, "
 "vil du sjekke \"CUPS server\" -knappen hvis du vil at skrivere på maskinen "
@@ -2014,12 +2067,11 @@ msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "Settet med sjekkknapper består bare av de vanligste tjenestene. Med "
 "\"Avansert\" -knappen kan du aktivere meldinger som samsvarer med en "
@@ -2028,12 +2080,12 @@ msgstr ""
 "skilt)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-nummer>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2044,7 +2096,7 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2054,7 +2106,7 @@ msgstr ""
 "av tjenesten."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2063,7 +2115,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2072,7 +2124,7 @@ msgstr ""
 "par for samme port."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formater"
 
@@ -2081,14 +2133,14 @@ msgstr "Formater"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2098,22 +2150,23 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Her kan du velge hvilken partisjon (er) du ønsker å formatere. Eventuelle "
 "data på partisjoner <emphasis>som ikke er</emphasis>merket for formatering, "
 "blir lagret."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr "Vanligvis må minst partisjonene DrakX valgte, formateres"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2122,12 +2175,13 @@ msgstr ""
 "å kontrollere for så kallede <emphasis>bad blocks</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Hvis du ikke er sikker på at du har gjort det riktige valget, kan du klikke "
 "på <guibutton>Forrige</guibutton>, igjen på <guibutton>Forrige</guibutton> "
@@ -2135,7 +2189,7 @@ msgstr ""
 "hovedskjermbildet. I det kan du velge om du vil se hva som er i partisjonene."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2144,12 +2198,12 @@ msgstr ""
 "fortsette."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX er Mageia installereren"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2160,7 +2214,7 @@ msgstr ""
 "mulig."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2170,36 +2224,40 @@ msgstr ""
 "trenger."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Installasjons velkomstskjermen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Bruker en Mageia DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Her er standard velkomstskjermer når du bruker en Mageia DVD, den første med "
 "et UEFI-system og det andre med et Legacy-system:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Fra denne skjermen kan du få tilgang til alternativer ved å trykke på \"e\" -"
 "bokstaven for å gå inn i \"redigeringsmodus\". For å komme tilbake til denne "
@@ -2207,116 +2265,109 @@ msgstr ""
 "trykk på \"Ctrl\" eller \"F10\" for å avslutte med lagring."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Fra denne skjermen er det mulig å angi noen personlige preferanser:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Språket (kun for installasjonen kan være annerledes enn det valgte språket "
-"for systemet) ved å trykke på tasten F2 (bare Legacy modus)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Bruk piltastene til å velge språk og trykk på tasten Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Her er for eksempel den franske velkomstskjermen når du bruker en Live DVD / "
-"CD. Merk at Live DVD / CD-menyen ikke foreslår:<guilabel>Rescue System</"
-"guilabel>, <guilabel>Minnetest</guilabel> og <guilabel>Hardware Detection "
-"Tool</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Bruk piltastene til å velge språk og trykk på tasten Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "Endre skjermoppløsningen ved å trykke F3-tasten (bare legemodus)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Legg til noen alternativer ved å trykke <emphasis role=\"bold\">F6</"
-"emphasis> tasten for legacy modus eller <emphasis role=\"bold\">e</emphasis> "
-"tasten for  UEFI modus."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Standard, det endrer ikke noe i standardvalgene."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Hvis installasjonen mislykkes, kan det være nødvendig å prøve igjen ved "
-"hjelp av ett av de ekstra alternativene. Menyen som kalles av F6 viser en ny "
-"linje som heter <guilabel>Oppstarts alternativer</guilabel> og foreslå fire "
-"oppføringer:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Standard, det endrer ikke noe i standardvalgene."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Ingen ACPI (Advanced Configuration and Power Interface), strømstyring blir "
 "ikke tatt i betraktning."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Ingen lokal APIC (Local Advanced Programmable Interrupt Controller), det "
 "handler om CPU-forstyrrelser, velg dette alternativet hvis du blir bedt om "
 "det."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2325,54 +2376,52 @@ msgstr ""
 "vises i<guilabel>Oppstartsalternativer</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "I enkelte Mageia utgivelser kan det hende at oppføringene som er valgt med "
 "nøkkelen F6, ikke vises i<guilabel>Oppstartsalternativer</guilabel> , men de "
 "bli virkelig brukt."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Legg til flere alternativer for kjernen ved å trykke F1 (Kun i Legacy modus)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Ved å trykke F1 åpnes et nytt vindu med flere tilgjengelige alternativer. "
 "Velg en med piltastene og trykk Enter for å få flere detaljer, eller trykk "
 "på Esc-tasten for å gå tilbake til velkomstskjermbildet."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Den detaljerte visningen om alternativet splash. Trykk på Esc eller velg "
 "<guilabel>Gå tilbake til Oppstartsalternativer</guilabel> for å gå tilbake "
@@ -2380,19 +2429,22 @@ msgstr ""
 "<guilabel>Oppstartsalternativer</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Hjelpen er oversatt til det valgte språket med F2-tasten."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2402,80 +2454,47 @@ msgstr ""
 "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><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Bruke et kablet nettverk."
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Her er standard velkomstskjermen når du bruker en kablet nettverksbasert "
-"installasjons-CD (netinstall.iso eller netinstall-nonfree.iso-bilder):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Det tillater ikke å endre språket, de tilgjengelige alternativene er "
-"beskrevet på skjermen. For mer informasjon om bruk av en kablet "
-"nettverksbasert installasjons-CD, se <link ns2:href=\"https://wiki.mageia."
-"org/en/Boot.iso_install\">Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Tastaturoppsettet er det amerikanske."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Installasjonsfasene"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Installasjonsprosessen er delt inn i en rekke trinn, som kan følges på "
 "skjermens sidepanelet."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Hvert trinn har en eller flere skjermer som også kan ha <guibutton>Avansert</"
 "guibutton> knapper med ekstra og mindre vanlige alternativer."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "De fleste skjermbildene har <guibutton>Hjelp</guibutton> knapper som gir "
 "ytterligere forklaringer om det aktuelle steget."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2493,17 +2512,17 @@ msgstr ""
 "trykk <guibutton>Alt Ctrl Delete</guibutton> samtidige for omstart."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installasjonsproblem og mulige løsninger"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Ikke Grafisk grensesnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2514,13 +2533,16 @@ msgstr ""
 "skrive <code>vgalo</code> ved prompten."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Hvis maskinvaren er svært gammel, kan det hende at det ikke er mulig å "
 "installere en grafisk installasjon. I dette tilfellet er det verdt å prøve "
@@ -2530,12 +2552,12 @@ msgstr ""
 "installasjonen i tekstmodus."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Installasjonen fryser"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2550,14 +2572,15 @@ msgstr ""
 "med andre alternativer etter behov."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2568,18 +2591,20 @@ msgstr ""
 "<code>mem=256M</code> vil gi 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamiske partisjoner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Hvis du konverterte harddisken fra \"grunnleggende\" format til \"dynamisk\" "
 "format på Microsoft Windows, må du vite at det er umulig å installere Mageia "
@@ -2597,18 +2622,18 @@ msgstr "Oppdateringer"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2617,10 +2642,11 @@ msgstr ""
 "pakker vil ha blitt oppdatert eller forbedret."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Velg <guilabel>ja</guilabel> hvis du ønsker å laste ned og installere de, "
@@ -2628,8 +2654,9 @@ msgstr ""
 "du ikke er koblet til internett."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Press<guibutton>Neste</guibutton> for å fortsette."
 
 #. type: Content of: <section><info><title>
@@ -2686,18 +2713,18 @@ msgstr "Mediumvalg (Ikke fri)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2710,7 +2737,7 @@ msgstr ""
 "i de neste trinnene."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2719,7 +2746,7 @@ msgstr ""
 "inneholder kjernedistribusjonen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2734,13 +2761,14 @@ msgstr ""
 "forskjellige WiFi-kort, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 " <emphasis>Tainted</emphasis> pakkebrønnen inneholder pakker utgitt under en "
 "fri lisens. Hovedkriteriene for å plassere pakker i dette depotet er at de "
@@ -2749,37 +2777,40 @@ msgstr ""
 "trengs for å spille kommersiell video-DVD, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimal Installasjon"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Du kan velge en minimal installasjon ved å de-velge alt på skjermbildet for "
 "valg av pakkegruppe, se <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Hvis ønskelig, kan du også krysse alternativet \"Individuell pakkevalg\" på "
 "samme skjerm."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Minimal installasjon er beregnet for de med spesifikke anvendelser i tankene "
 "for deres <application>Mageia</application>, for eksempel en server eller en "
@@ -2788,9 +2819,10 @@ msgstr ""
 "installasjonen din, se<xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Hvis du velger denne installasjonsklassen, vil det relaterte skjermbildet gi "
@@ -2798,16 +2830,14 @@ msgstr ""
 "X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Hvis valgt, \"Med X\" vil det også inkludere IceWM somert lett "
-"skrivebordsmiljø."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2822,15 +2852,15 @@ msgstr ""
 "sider."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2847,11 +2877,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX gjorde smarte valg for konfigurasjonen av systemet ditt, avhengig av "
 "hvilke valg du har gjort,  og på maskinvaren DrakX oppdaget. Du kan sjekke "
@@ -2860,9 +2891,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Som hovedregel anbefales standardinnstillinger, og du kan beholde dem med 3 "
 "unntak:"
@@ -2879,70 +2911,74 @@ msgstr "standardinnstillingen er allerede prøvd, og den mislykktes"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "noe annet er sagt i de detaljerte delene nedenfor"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Systemparametere"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Tidssone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX valgte en tidssone for deg, avhengig av ditt foretrukne språk. Du kan "
 "endre det om nødvendig. Se også<xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land/ Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Hvis du ikke er i det valgte landet, er det svært viktig at du korrigerer "
 "innstillingen. Se <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Oppstartslaster</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX har gjort bra valg for oppstartslaster parametrene"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Ikke gjør endringer hvis du ikke vet hvordan du konfigurerer Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "For mer informasjon, se <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Brukeradministrasjon</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2951,22 +2987,23 @@ msgstr ""
 "hjemme</literal> områder."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Tjenester</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systemtjenester refererer til de små programmene som kjører bakgrunnen "
 "(daemoner). Dette verktøyet lar deg aktivere eller deaktivere bestemte "
 "oppgaver."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2975,31 +3012,32 @@ msgstr ""
 "datamaskinen din fungerer som den skal."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "For mer informasjon, se <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Maskinvare-parametre"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastatur</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Dette er hvor du konfigurerer eller endrer tastaturoppsettet ditt, som "
 "avhenger av plasseringen, språket eller typen tastatur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3008,50 +3046,51 @@ msgstr ""
 "avhenger av plassering, språk eller tastaturtype."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr "Her kan du legge til, konfigurere andre pekenheter."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>lydkort</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Installasjonsprogrammet bruker en standarddriverdersom en slik finnes. "
 "Alternativet for å velge en annen driver blir bare gitt når det er mer enn "
 "én driver for kortet ditt, men ingen av dem er satt som standard."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafisk grensesnitt</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "Denne seksjonen lar deg konfigurere grafikkkort og skjermer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "For mer informasjon, se <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3060,20 +3099,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Nettverk og internettparametre"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Nettverk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3083,21 +3123,22 @@ msgstr ""
 "media pakkebrønnene."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Når du legger til et nettverkskort, ikke glem å sette opp dette "
 "grensesnittet i brannmuren også."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxier</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3108,26 +3149,27 @@ msgstr ""
 "tjeneste."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Du må kanskje konsultere systemadministratoren for å få parameterne du skal "
 "skrive inn her"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Sikkerhet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Sikkerhetsnivå</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3136,17 +3178,17 @@ msgstr ""
 "standardinnstillingen (Standard) tilstrekkelig til generell bruk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Marker det alternativet som best passer dine behov."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Brannmur</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3155,7 +3197,7 @@ msgstr ""
 "der ute på internett som ville kompromittere eller stjele dine data."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3166,7 +3208,7 @@ msgstr ""
 "\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "Husk at å tillate alt (ingen brannmur) kan være veldig risikabelt."
 
@@ -3234,39 +3276,73 @@ msgstr ""
 "plass for å installere. <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Sett opp partisjonsstørrelser:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Du kan justere sikkerhetsnivået ditt her."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Avansert</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "La det stå tomt hvis du ikke vet hva du bør gjøre."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Etter installasjonen vil det alltid være mulig å justere "
 "sikkerhetsinnstillingene i <guilabel>Sikkerhet</guilabel> som er en del av  "
@@ -3284,25 +3360,27 @@ msgstr "Introduksjon"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia distribueres som ISO bilder. Denne siden vil hjelpe deg til å velge "
 "hvilket bilde som passer dine behov."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Det er to typer media:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassisk installasjon: Etter å ha startet mediet, følger det en prosess som "
 "gjør det mulig å velge hva du skal installere og hvordan du konfigurerer "
@@ -3311,83 +3389,87 @@ msgstr ""
 "installere."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE media: du kan starte mediet i et ekte Mageia-system uten å installere "
-"det, for å se hva du får etter installasjonen. Installasjonsprosessen er "
-"enklere, men du får mindre valg."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Detaljer finnes i de neste seksjonene."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definisjon"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Her er et medium (flertall: media) en ISO-bildefil som gjør at du kan "
 "installere og / eller oppdatere Mageia, og i tillegg til enhver fysisk "
 "støtte som ISO-filen er kopiert til."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Du kan finne dem <link ns4:href=\"http://www.mageia.org/en/downloads/\">her</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassisk installasjonsmedia"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Felles egenskaper"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Disse ISOene bruker den tradisjonelle installereren, DrakX."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "De kan enten gjøre en ren installasjon eller oppgrader fra en tidligere "
 "versjon."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Forskjellige media for 32 eller 64 biters arkitektur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3396,112 +3478,117 @@ msgstr ""
 "Test, Hardware Detection Tool."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Hver DVD inneholder mange tilgjengelige skrivebordsmiljøer og språk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "Under installasjonen kan du velge å legge til ikke fri programvare"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Kan brukes til å forhåndsvise distribusjonen uten å installere den på en "
 "HDD, og eventuelt installere Mageia på HDD."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "Hver ISO inneholder kune et skrivebordsmiljø (Plasma, GNOME eller Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live ISO-er kan bare brukes til å lage rene "
 "installasjoner, de kan ikke brukes til å oppgradere fra tidligere utgivelser."
 "</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "De inneholder ikke fri programvare"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Kun Plasma desktop."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Alle språk er tilgjengelige"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Kun 64 bits arkitektur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Kun GNOME desktop."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Kun 64 bits arkitektur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Kun Xfce desktop."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 eller 64 bits arkitektur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Kun oppstarts CD media"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3513,28 +3600,30 @@ msgstr ""
 "Internett."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Disse mediene er svært lyse (mindre enn 100 MB) og er praktisk når "
 "båndbredden er for lav til å laste ned en full DVD, en PC uten DVD-stasjon "
 "eller en PC som ikke kan starte fra en USB-pinne."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Kun Engelsk."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3568,11 +3657,12 @@ msgstr "Laster ned"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Når du har valgt din ISO-fil, kan du laste den ned med enten http eller "
 "BitTorrent. I begge tilfeller gis det noe informasjon i et vindu , for "
@@ -3586,10 +3676,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum og sha1sum er verktøy for å kontrollere ISO-integriteten. Bruk bare "
 "en av dem. Behold en av dem <link linkend=\"integrity\">for ytterligere "
@@ -3602,8 +3693,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Klikk radioknappen Lagre Fil."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3611,14 +3702,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Kontrollerer integriteten til det nedlastede mediet"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Begge kontrollsummene er heksadesimale tall beregnet av en algoritme fra "
 "filen som skal lastes ned. Når du spør disse algoritmene om å beregne dette "
@@ -3628,69 +3720,84 @@ msgstr ""
 "ved hjelp av BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Åpne et konsollvindu, du trenger ikke være rot og:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- For å bruke md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- For å bruke sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"og sammenlign det oppnådde nummeret på datamaskinen din (du må kanskje vente "
-"en stund) med nummeret gitt av Mageia. Eksempel:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"og sammenlign det oppnådde nummeret på datamaskinen din (du må kanskje vente "
+"en stund) med nummeret gitt av Mageia. Eksempel:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Brenn eller dump ISOen"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Den sjekket ISO kan nå brennes til en CD eller DVD eller dumpes til en USB-"
 "pinne. Disse operasjonene er ikke en filkopiering, men tar sikte på å lage "
 "et oppstartbart medium."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Brenner ISO til en CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Bruk hvilken brenner du ønsker, men vær sikker på at brenneverktøyet er satt "
 "opp korrekt for å  <emphasis role=\"bold\">brenne et bilde</emphasis>, "
@@ -3699,12 +3806,12 @@ msgstr ""
 "\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Dumper ISOen til en USB disk"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3713,18 +3820,19 @@ msgstr ""
 "USB-pinne og deretter bruke den til å starte og installere systemet."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"Dumping\" et bilde på en flash-enhet ødelegger det tidligere filsystemet "
 "på enheten; eventuelle andre data vil gå tapt og partisjonskapasiteten blir "
 "redusert til bildestørrelsen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3733,12 +3841,12 @@ msgstr ""
 "og omformater USB-pinnen."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Bruker et grafisk verktøy inne i Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3747,73 +3855,72 @@ msgstr ""
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Bruker et grafisk verktøy i Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Du kan prøve:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> bruke "
 "\"ISO bildet\" alternativet;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Å bruke kommandolinje i et GNU/Linux system"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Det er potensielt * farlig * å gjøre dette for hånd. Du risikerer å "
 "overskrive en diskpartisjon hvis du får enhets-ID feil."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Du kan også bruke dd verktøyet i en konsoll:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Åpne et konsollsvindu"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Bli root med kommandoen  <userinput>su -</userinput> (ikke glem '-' på "
 "slutten)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3822,28 +3929,40 @@ msgstr ""
 "program eller en filbehandling som kan få tilgang til eller lese den)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Skriv inn komandoen <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Finn enhetsnavnet til USB-pinnen (fra størrelsen), for eksempel <code>/dev/"
+"sdb</code> i skjermebildet ovenfor er det en 8GB USB pinne."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Alternativt kan du hente enhetsnavnet med kommandoen <code>dmesg</code>: til "
 "slutt ser du enhetsnavnet som starter med <emphasis>sd</emphasis>, og "
 "<emphasis>sdd</emphasis> i dette tilfellet:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3885,46 +4004,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Finn enhetsnavnet til USB-pinnen (fra størrelsen), for eksempel <code>/dev/"
-"sdb</code> i skjermebildet ovenfor er det en 8GB USB pinne."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Skriv inn kommandoen: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Hvor X=enhetsnavnet feks: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Eksempel: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Skriv inn kommandoen: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Ferdig, ta ut USB disken. "
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3954,19 +4082,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Hvis lan det ditt ikke er listet, klikk på <guilabel>Andre land</guilabel> "
 "knappen og velg landet ditt eller regionen der."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Hvis landet ditt bare er i  <guilabel>Andre land</guilabel> listen, etter at "
@@ -3975,18 +4105,19 @@ msgstr ""
 "valg.."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Innput metode"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "I <guilabel>Andre land</guilabel> skjermbildet kan du også velge en "
@@ -3998,67 +4129,67 @@ msgstr ""
 "pakkevalg."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Hvis du savner in-put oppsettet under installasjonen, kan du få tilgang til "
 "den etter at du har startet opp det installerte systemet via \"Konfigurer "
 "datamaskinen\" -> \"System\", eller ved å kjøre localedrake som rot."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installer eller Oppgrader"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installer"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Bruk dette alternativet for en nyinstallasjon av <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Oppgrader"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Hvis du har en eller flere <application>Mageia</application> installasjoner "
-"på systemet ditt, vil installasjonen tillate at du oppgraderer fra en av de "
-"til siste utgivelse."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Bare oppgradering fra en tidligere Mageia-versjon som var <emphasis>still "
 "supported</emphasis> da denne installatørens versjon ble utgitt, har blitt "
@@ -4067,16 +4198,17 @@ msgstr ""
 "installasjon mens du beholder din <literal>/home</literal> partisjon."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Hvis du under installasjonen bestemmer deg for å stoppe installasjonen, er "
 "det mulig å starte på nytt, men vær så snill å tenke to ganger før du gjør "
@@ -4088,12 +4220,14 @@ msgstr ""
 "trykk<guilabel>Alt Ctrl Delete</guilabel> samtidig for omstart"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Hvis du har oppdaget at du har glemt å velge et ekstra språk, kan du gå "
 "tilbake fra skjermbildet \"Installere eller oppgradere\" til skjermbildet "
@@ -4127,12 +4261,12 @@ msgstr ""
 "er valgt i henhold til ditt valgte språk og tidssone."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4141,16 +4275,17 @@ msgstr ""
 "passende tastatur, vil amerikansk tastaturlayout bli satt som standard."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4167,22 +4302,24 @@ msgstr ""
 "wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Hvis tastaturet  ikke vises i listen, klikk<guibutton>Mer</guibutton> for å "
 "få en komplett liste og velg tastaturet ditt fra denne."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Etter å ha valgt  <guibutton>Mer</guibutton> dialogen, vil du bli sendt "
 "tilbake til det første tastaturvalgetl rog det vil virke som om et tastatur "
@@ -4190,23 +4327,24 @@ msgstr ""
 "installasjonen: Ditt tastatur er det du valgte fra den hele listen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Hvis du velger et tastatur basert på ikke-latinske tegn, vil du se en ekstra "
 "dialogskjerm som spør hvordan du foretrekker å bytte mellom latinske og ikke-"
 "latinske tastaturoppsett"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Velg språk"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4217,7 +4355,7 @@ msgstr ""
 "installasjonen og for det installerte systemet."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4226,12 +4364,13 @@ msgstr ""
 "dette valget under  installasjonen og for det installerte systemet."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Hvis det er sannsynlig at du vil kreve flere språk installert på systemet "
 "ditt, for deg selv eller andre brukere, bør du bruke <guibutton>Flere språk</"
@@ -4239,7 +4378,7 @@ msgstr ""
 "til ekstra språkstøtte etter installasjon."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4252,18 +4391,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Selv om du velger mer enn ett språk, må du først velge en av dem som ditt "
 "foretrukne språk på førstespråk skjermen. Det vil også bli merket som valgt "
 "på skjermbildet for flere språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4272,23 +4412,24 @@ msgstr ""
 "tilrådelig å installere språket til tastaturet ditt også."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia bruker UTF-8 (Unicode) som standard."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Dette kan være deaktivert på skjermen \"flere språk\" hvis du vet at det er "
 "upassende for språket ditt. Deaktivering av UTF-8 gjelder for alle "
 "installerte språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4341,70 +4482,75 @@ msgstr ""
 "å konfigurere knappene som ikke virker på en mus med 6 eller flere knapper."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Legg til eller endre et oppstartsmenypunkt"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "For å gjøre det må du manuelt redigere /boot/grub2/custom.cfg eller bruke "
 "programvaren grub-tilpasser i stedet (Tilgjengelig i Mageia-pakkebrønnene)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "For mer informasjon, se vår wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Hovedvalg for oppstartslaster"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Oppstartslaster grensesnitt"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Mageia bruker som standard kun:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (med eller uten en grafisk meny) for et eledre/MBR eller eldre GPT "
 "system"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi for et UEFI system."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageias grafiske menyer er fine :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 på et eldre/MBR og eldre/GPT system"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4417,27 +4563,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Ikke endre \"Boot Device\", med mindre du virkelig vet hva du gjør."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi på UEFI systemer"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Med et UEFI-system er brukergrensesnittet litt annerledes da du ikke kan "
 "velge mellom med eller uten grafisk meny"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4450,14 +4601,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Hvis Mageia er det eneste systemet som er installert på datamaskinen, "
@@ -4469,36 +4621,41 @@ msgstr ""
 "anbefalt og nok uansett antall operativsystemer du har."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Bruker en Mageia oppstartslaster"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Som standard i henhold til systemet ditt, skriver Mageia en ny:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 oppstartslaster, enten til MBR (Master Boot Record)  på den første "
 "harddisken eller til  BIOS oppstartspartisjonen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi oppstartslaster til ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Hvis du allerede har andre operativsystemer installert, forsøker Mageia å "
 "legge dem til din nye Mageia oppstartsmeny. Hvis du ikke vil ha denne "
@@ -4506,7 +4663,7 @@ msgstr ""
 "<guilabel>Teste Fremmed OS</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4519,18 +4676,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Bruker en eksisterende oppstartslaster"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Den nøyaktige prosedyren for å legge Mageia-systemet til en eksisterende "
 "oppstartslaster er utenfor rammen av denne hjelpen, men i de fleste "
@@ -4539,16 +4697,17 @@ msgstr ""
 "dokumentasjonen for det aktuelle operativsystemet."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Bruker kjedelasting"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Hvis du ikke vil ha en oppstartbar Mageia, men laste den fra et annet "
 "operativsystem, klikker du på<guibutton>Neste</guibutton>, så på "
@@ -4556,7 +4715,7 @@ msgstr ""
 "eller MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4569,7 +4728,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4578,7 +4737,7 @@ msgstr ""
 "klikke på <guibutton>OK</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4587,33 +4746,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Valg"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Første side"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Forsinkelse før oppstart av standardbildet</guilabel>: Denne "
 "tekstboksen lar deg angi en forsinkelse i sekunder før standard "
 "operativsystemet er startet opp."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Sikkerhet</guilabel>: Dette lar deg sette et passord for "
 "oppstartslasteren. Dette betyr at brukernavn og passord må oppgis ved "
@@ -4621,37 +4781,37 @@ msgstr ""
 "Brukernavnet er \"root\" og passordet er det som er valgt her etter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Passord</guilabel>: Denne tekstboksen er hvor du faktisk skriver "
 "inn passordet"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Passord (igjen)</guilabel>: Skriv inn passordet igjen, og Drakx "
 "vil kontrollere at det samsvarer med det som er angitt ovenfor."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Avansert</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Aktiver ACPI:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) er en standard for strømstyring. Det kan spare energi ved å "
@@ -4661,21 +4821,22 @@ msgstr ""
 "problemer (for eksempel tilfeldige omstart eller systemlåser)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Aktiver SMP</guilabel>: Dette alternativet aktiverer / deaktiverer "
 "symmetrisk multiprosessering  for fler-kjærne prosessorer."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Aktiver APIC</guilabel>: Aktivering eller deaktivering av dette "
 "gir operativsystemet tilgang til den avanserte programmerbare "
@@ -4683,26 +4844,27 @@ msgstr ""
 "og Avansert IRQ (Interrupt Request) -administrasjon."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Aktiver Lokal APIC</guilabel>: Her kan du angi lokale APIC, som "
 "administrerer alle eksterne avbrudd for en bestemt prosessor i et SMP-system."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Neste side"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr "<guilabel>Standard:</guilabel> Operatsystemet startet opp av standard"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4712,7 +4874,7 @@ msgstr ""
 "starter opp."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4721,18 +4883,19 @@ msgstr ""
 "\"setupMageiaBootloader\">Bruker en Mageia oppstartslaster</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Video modus:</guilabel> Dette setter skjermstørrelsen og "
 "fargedybden som startmenyen vil bruke. Hvis du klikker på nedre trekant, vil "
 "du bli tilbudt andre størrelses- og fargedybdealternativer."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4741,7 +4904,7 @@ msgstr ""
 "linkend=\"setupChainLoading\">Bruker kjedelasting</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Set opp SCSI"
 
@@ -4754,36 +4917,39 @@ msgstr "Set opp SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX oppdager vanligvis harddisker på riktig måte. Med noen eldre SCSI-"
 "kontrollere kan det hende at det ikke er mulig å bestemme de riktige "
 "driverne som skal brukes, og deretter mislykkes det å gjenkjenne stasjonen."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Hvis dette skjer, må du manuelt fortelle Drakx hvilken SCSI-stasjon (er) du "
 "har."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX skal da kunne konfigurere stasjonen (e) riktig."
 
@@ -4804,10 +4970,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "I denne skjermen er navnet på driveren som installasjonen valgte for "
 "lydkortet ditt gitt, denne vil være standarddriveren, dersom vi har en "
@@ -4830,42 +4996,47 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Deretter klikker du på Draksound eller \"Sound Configuration\" -verktøyet "
 "<guibutton>Avansert</guibutton> og så <guibutton>Feilsøking</guibutton> for "
 "å finne svært nyttige råd om hvordan du løser problemet."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avansert"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Å klikke <guibutton>Avansert</guibutton> i denne skjermen, under "
 "installasjon, kan  være nyttig hvis det ikke er noen standarddriver, og det "
 "finnes flere drivere tilgjengelig, dersom du tror installasjonen valgte feil."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "I så fall kan du velge en annen driver etter å ha klikket på <guibutton>La "
 "meg plukke en driver</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Bekreft hvilken hard disk som skal formateres."
 
@@ -4876,13 +5047,13 @@ msgstr "Bekreft hvilken hard disk som skal formateres."
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4892,17 +5063,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klikk <guibutton>Forrige</guibutton> hvis du ikke er sikker på valgene dine."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klikk <guibutton>Neste</guibutton> hvis du er sikker og vil slette alle "
 "partisjoner, alle operativsystemer og alle dataene på harddisken."
@@ -5026,43 +5200,41 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Avinstaller Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Hvordan"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Hvis Mageia ikke overbeviste deg eller du ikke kan installere den riktig, "
 "kort sagt, du vil bli kvitt den. Det kan du gjører.  Mageia gir deg også "
 "muligheten til å avinstallere. Dette gjelder ikke for alle operativsystemer."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Etter sikkerhetskopiering av data, start på nytt Mageia DVD og velg Rescue "
 "system, og gjenopprett Windows oppstartslasteren. Ved neste oppstart vil du "
 "bare ha Windows uten valg for å velge operativsystem."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "For å gjenopprette plassen som brukes av Mageia partisjonene på Windows, "
 "klikk på <code>Start -> Kontroll Panel -> Administrative Verktøy -> "
@@ -5072,8 +5244,8 @@ msgstr ""
 "disken. Høyreklikk på hver av disse partisjonene og velg <guibutton>Slett</"
 "guibutton>. Plassen vil bli frigjort."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5081,14 +5253,15 @@ msgstr ""
 "Hvis du bruker Windows XP, kan du skape en ny partisjon in (FAT 32 eller "
 "NTFS) med en partisjonsbokstav."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Hvis du har Vista elelr Win 7, har du en mulighet til. Du kan utvide den "
 "eksisterende partisjonen, som er til venstre fra den ledige plassen. Det "
@@ -5140,3 +5313,330 @@ msgid ""
 msgstr ""
 "Neste steg er kopiering av filene til disken. Dette tar noen minutter. Til "
 "slutt får du en tom skjerm for en stund, noe som er normalt."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Passord (igjen)</guilabel>: Skriv inn brukerpassordet på nytt i "
+#~ "denne tekstboksen, og drakx vil kontrollere at du har samme passord i "
+#~ "hver av tekstboksene."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "I tillegg kan du deaktivere eller aktivere en gjestekonto."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Alt som en bruker med en standard <emphasis>rbash</emphasis> gjestekonto "
+#~ "lagrer til sitt hjemmeområde vil bli automatisk slettet ved utlogging. "
+#~ "Gjestebrukeren bør lagre sine viktige filer på en USB pinne."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Aktiver gjestekonto</guilabel>: Her kan du aktivere eller "
+#~ "deaktivere en gjestekonto. Gjestekontoen lar en gjest logge inn og bruke "
+#~ "PCen med mindre rettigheter en normale brukere."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Gruppe ID</guilabel>: Her angir du gruppe id, som også er et "
+#~ "nummer. Normalt er dette det samme som bruker ID. La det stå tomt om du "
+#~ "ikke vet hva du gjør."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Enhet\", består av: \"disk\", [\"disk nummer\"(bokstav)], "
+#~ "\"partisjonsnummer\" (f.eks,\"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Arbeidsstasjon"
+
+#~ msgid "Server."
+#~ msgstr "Server"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafisk miljø"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Det er fire grupper, klikk på trekanten foran en gruppe for å ekspandere "
+#~ "gruppen slik at alle inngående tjenester vises."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Hvis du ikke finner kortet ditt i leverandørlisten (fordi det ikke er i "
+#~ "databasen eller det er et eldre kort), kan du finne en passende driver i "
+#~ "kategorien Xorg."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Det finnes en fane for hver oppdaget harddisk eller annen lagringsenhet, "
+#~ "som en USB-nøkkel. For eksempel sda, sdb og sdc hvis det er tre av dem."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "Installasjonen vil dele tilgjengelig plass etter følgende regler:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Juster til\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Fri plass foran (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Fra denne skjermen er det mulig å angi noen personlige preferanser:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Språket (kun for installasjonen kan være annerledes enn det valgte "
+#~ "språket for systemet) ved å trykke på tasten F2 (bare Legacy modus)."
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Her er for eksempel den franske velkomstskjermen når du bruker en Live "
+#~ "DVD / CD. Merk at Live DVD / CD-menyen ikke foreslår:<guilabel>Rescue "
+#~ "System</guilabel>, <guilabel>Minnetest</guilabel> og <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Legg til noen alternativer ved å trykke <emphasis role=\"bold\">F6</"
+#~ "emphasis> tasten for legacy modus eller <emphasis role=\"bold\">e</"
+#~ "emphasis> tasten for  UEFI modus."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Hvis installasjonen mislykkes, kan det være nødvendig å prøve igjen ved "
+#~ "hjelp av ett av de ekstra alternativene. Menyen som kalles av F6 viser en "
+#~ "ny linje som heter <guilabel>Oppstarts alternativer</guilabel> og foreslå "
+#~ "fire oppføringer:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Legg til flere alternativer for kjernen ved å trykke F1 (Kun i Legacy "
+#~ "modus)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Bruke et kablet nettverk."
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Her er standard velkomstskjermen når du bruker en kablet nettverksbasert "
+#~ "installasjons-CD (netinstall.iso eller netinstall-nonfree.iso-bilder):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Det tillater ikke å endre språket, de tilgjengelige alternativene er "
+#~ "beskrevet på skjermen. For mer informasjon om bruk av en kablet "
+#~ "nettverksbasert installasjons-CD, se <link ns2:href=\"https://wiki.mageia."
+#~ "org/en/Boot.iso_install\">Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Tastaturoppsettet er det amerikanske."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Hvis valgt, \"Med X\" vil det også inkludere IceWM somert lett "
+#~ "skrivebordsmiljø."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Du kan justere sikkerhetsnivået ditt her."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "La det stå tomt hvis du ikke vet hva du bør gjøre."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE media: du kan starte mediet i et ekte Mageia-system uten å "
+#~ "installere det, for å se hva du får etter installasjonen. "
+#~ "Installasjonsprosessen er enklere, men du får mindre valg."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Kun oppstarts CD media"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Klikk radioknappen Lagre Fil."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Du kan også bruke dd verktøyet i en konsoll:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Ferdig, ta ut USB disken. "
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Bruk dette alternativet for en nyinstallasjon av <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."
+#~ msgstr ""
+#~ "Hvis du har en eller flere <application>Mageia</application> "
+#~ "installasjoner på systemet ditt, vil installasjonen tillate at du "
+#~ "oppgraderer fra en av de til siste utgivelse."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Hvordan"
diff --git a/docs/docs/stable/installer/nl.po b/docs/docs/stable/installer/nl.po
index 94a3503e..6434b500 100644
--- a/docs/docs/stable/installer/nl.po
+++ b/docs/docs/stable/installer/nl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-07-14 16:57+0000\n"
 "Last-Translator: dragnadh <dragnadh@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -33,12 +33,13 @@ msgstr "Licentie en uitgave-opmerkingen"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -72,8 +73,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Selecteer <guilabel>Accepteren</guilabel> en klik dan op "
@@ -96,22 +98,23 @@ msgstr "Uitgave-opmerkingen"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Klik op de <guibutton>Uitgave-opmerkingen</guibutton> knop om belangrijke "
 "informatie te zien over deze versie van <application>Mageia</application>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "nl"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Mediaselectie (Configureer aanvullende installatiebronnen)"
 
@@ -119,23 +122,25 @@ msgstr "Mediaselectie (Configureer aanvullende installatiebronnen)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Dit scherm geeft u de lijst van de reeds erkende bronnen. U kunt andere "
 "bronnen toevoegen, zoals optische schijven of een bron op afstand.  De keuze "
@@ -143,23 +148,25 @@ msgstr ""
 "beschikbaar zullen zijn."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Voor een netwerkbron dienen twee stappen gevolgd te worden:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Kiezen en activeren van een netwerk, tenzij al actief."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Kiezen van een mirror of specificeren van een URL (de eerste keuze).  Door "
 "een mirror te kiezen heeft u toegang tot de selectie van alle bronnen die "
@@ -167,14 +174,15 @@ msgstr ""
 "kunt u ook een specifieke bron opgeven of uw eigen NFS installatie."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Als u een 64-bitsinstallatie die mogelijk enige 32-bitspakketten bevat, "
 "opwaardeert, voeg dan hier een online spiegelserver toe door een van de "
@@ -190,7 +198,7 @@ msgstr "Gebruikersbeheer"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -203,21 +211,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Beheerderswachtwoord (root)  instellen:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Voor elke <application>Mageia</application> installatie wordt aanbevolen een "
 "superuser- of beheerderswachtwoord in te stellen, gewoonlijk heet dit het "
@@ -229,9 +237,10 @@ msgstr ""
 "sluiten."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Alle wachtwoorden zijn hoofdlettergevoelig. In een wachtwoord is het is het "
@@ -239,16 +248,18 @@ msgstr ""
 "en andere tekens."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Voer een gebruiker in"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Voeg hier een gebruiker toe. Een gebruiker heeft minder rechten dan de "
 "superuser (root), maar genoeg om over internet te surfen, "
@@ -256,7 +267,7 @@ msgstr ""
 "normaal mens zijn computer voor gebruikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -264,7 +275,7 @@ msgstr ""
 "<guibutton>Pictogram</guibutton>: klik op het pictogram om het te veranderen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -273,10 +284,11 @@ msgstr ""
 "gebruiker in."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Aanmeldnaam</guilabel>: Voer hier een aanmeldnaam voor de "
@@ -284,40 +296,44 @@ msgstr ""
 "volledige naam. <emphasis>De aanmeldnaam is hoofdlettergevoelig.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Wachtwoord</guilabel>: Typ hier het wachtwoord van de gebruiker. "
 "Aan het eind van het tekstvak is een schild dat de sterkte van het "
 "wachtwoord weergeeft. (Zie ook  <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Wachtwoord (nogmaals)</guilabel>: Herhaal het gebruikerswachtwoord "
-"in dit tekstvak en DrakX zal controleren of beide wachtwoorden gelijk zijn."
+"<guilabel>Wachtwoord (nogmaals)</guilabel>: Herhaal het wachtwoord en DrakX "
+"zal controleren of het overeenkomt met het wachtwoord dat hierboven is "
+"ingevoerd."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Elke gebruiker die u toevoegt tijdens het installeren van Mageia zal een "
 "thuismap hebben die zowel beschermd is tegen lezen als schrijven "
 "(umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -326,88 +342,60 @@ msgstr ""
 "<emphasis>Gebruikersbeheer</emphasis> te kiezen."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "De toegangsrechten kunnen na het installeren ook nog veranderd worden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Geavanceerd gebruikersbeheer"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Door op de <guibutton>Geavanceerd</guibutton> knop te klikken krijgt u een "
 "scherm waar u instellingen kunt bewerken voor de gebruiker die toegevoegd "
 "wordt."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Daarnaast kunt u een gastaccount activeren of deactiveren."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Alles dat een gast met een standaard <emphasis>rbash</emphasis> gastaccount "
-"opslaat in zijn /home map zal gewist worden als hij zich afmeldt. Zijn "
-"belangrijke gegevens kan hij het beste op een USB pen zetten."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Activeer het 'gast'-account</guilabel>: Zet hier een vinkje om een "
-"gastaccount te maken. Het gastaccount maakt het mogelijk dat een gast inlogt "
-"op de pc en hem gebruikt, maar hij heeft beperktere toegang dan een gewone "
-"gebruiker."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: In deze drop-down keuzelijst kan de shell "
 "veranderd worden voor de gebruiker die in het vorige scherm toegevoegd "
 "wordt. De mogelijkheden zijn Bash, Dash and Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Gebruikers-ID</guilabel>: Voer hier het gebruikers-ID in voor de "
 "gebruiker die in het vorige scherm toegevoegd wordt. Dit is een getal. Laat "
 "dit vak leeg, tenzij u weet wat u doet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Groep-ID</guilabel>: Hier kan de groep-ID ingevoerd worden, ook "
-"een getal, gewoonlijk hetzelfde als voor de gebruiker.  Laat dit vak leeg, "
-"tenzij u weet wat u doet."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Kies de koppelpunten"
 
@@ -424,13 +412,14 @@ msgstr "Kies de koppelpunten"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -440,7 +429,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -451,41 +440,45 @@ msgstr ""
 "application> voorstelt, kunt u ze veranderen."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Als u veranderingen aanbrengt, zorg dan dat u tenminste een <literal>/</"
 "literal> (root) partitie heeft."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Elke partitie wordt als volgt weergegeven: \"Apparaat\" (\"Grootte\", "
 "\"Koppelpunt\", \"Type\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Apparaat\" is samengesteld uit: \"harde schijf\", [\"harde schijf nummer"
-"\"(letter)], \"partitienummer\" (bijvoorbeeld, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Als u veel partities heeft, kunt u veel verschillende koppelpunten kiezen "
 "van het uitvouwmenu, zoals <literal>/</literal>, <literal>/home</literal> en "
@@ -495,20 +488,22 @@ msgstr ""
 "literal> partitie van een cauldron installatie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "U kunt het koppelpuntveld leeg laten voor partities waar u geen toegang voor "
 "nodig hebt."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Kies <guibutton>Vorige</guibutton> als u niet zeker bent van uw keuze en "
 "kies dan voor <guilabel>Aangepaste schijfpartitionering</guilabel>. In het "
@@ -517,7 +512,7 @@ msgstr ""
 "staat."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -781,8 +776,9 @@ msgstr "Werkomgevingselectie"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Afhankelijk van uw keuze hier kan het zijn dat u verdere schermen krijgt om "
@@ -790,8 +786,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -810,14 +807,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Kies of u de <application>KDE</application>- of de <application>Gnome</"
 "application>-werkomgeving wilt hebben. Bij beide is een volledige set "
@@ -845,8 +844,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -858,62 +858,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Werkstation."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafische omgeving."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuele pakketselectie: U kunt deze optie gebruiken om handmatig "
 "pakketten toe te voegen."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lees <xref linkend=\"minimal-install\"/> voor instructies over hoe u een "
 "minimale installatie (zonder of met X &amp; IceWM) kunt uitvoeren."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Softwarebeheer"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Hier kunt u extra pakketten toevoegen of verwijderen om uw installatie aan "
 "uw wensen aan te passen."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -929,47 +936,45 @@ msgstr ""
 "laden."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configureer uw diensten"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Hier kunt u instellen welke diensten (niet) moeten starten als u uw systeem "
 "opstart."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Er zijn vier groepen, klik op het driehoekje voor een groep om hem uit te "
-"vouwen en alle diensten erin te zien."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "De instellingen die DrakX koos zijn in de regel correct."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -978,7 +983,7 @@ msgstr ""
 "beneden."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Verander alleen iets als u heel goed weet wat u doet."
 
@@ -991,12 +996,13 @@ msgstr "Configureer uw tijdzone"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1006,18 +1012,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Kies uw tijdzone door uw land te kiezen of een stad die zich dicht bij u in "
 "dezelfde tijdzone bevindt."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "In het volgende scherm kunt u kiezen uw hardware clock op lokale tijd in te "
 "stellen of op UTC, ook wel GMT genoemd."
@@ -1032,23 +1040,23 @@ msgstr ""
 "allemaal op lokale tijd ingesteld staan, of op UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Kies een X-server (Configureer uw grafische kaart)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1057,7 +1065,7 @@ msgstr ""
 "grafische kaart gewoonlijk juist identificeren."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1066,37 +1074,30 @@ msgstr ""
 "en u weet welke u heeft, kunt u deze in de boomstructuur selecteren via:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "Vendor (producent)"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "dan de naam van uw kaart"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "en het type"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Als u de kaart niet in de Vendor-lijst kunt vinden (omdat ze zich nog niet "
-"in de gegevensbank bevindt of omdat het een oudere kaart is), vindt u "
-"mogelijk een geschikt stuurprogramma in de Xorg categorie."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "De Xorg lijst levert meer dan 40 algemene opensource-stuurprogramma's voor "
 "videokaarten. Als u nog steeds geen stuurprogramma met de naam van uw kaart "
@@ -1104,64 +1105,68 @@ msgstr ""
 "mogelijkheden biedt."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Let wel: als u een ongeschikt stuurprogramma kiest, heeft u enkel toegang "
 "tot de opdrachtregel-interface."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Sommige videokaartproducenten leveren fabrikantsgebonden stuurprogramma's "
 "voor Linux die enkel in de Nonfree installatiebronnen beschikbaar zijn en in "
 "sommige gevallen uitsluitend op de website van de betreffende fabrikant."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Om toegang tot de Nonfree installatiebronnen te krijgen, moeten ze "
 "uitdrukkelijk ingeschakeld worden. Doe dit zonodig meteen nadat u Mageia "
 "voor het eerst start."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configuratie van grafische kaart en monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Welke grafische omgeving (ook bekend als werkomgeving) u ook koos voor deze "
 "installatie van <application>Mageia</application>, zij is gebaseerd op een "
@@ -1174,7 +1179,7 @@ msgstr ""
 "dat de keuze verkeerd is."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1183,13 +1188,14 @@ msgstr ""
 "kaart uit de lijst."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Beeldscherm</guibutton></emphasis>: Indien van "
 "toepassing kunt u <guilabel>Plug'n Play</guilabel> kiezen, selecteer anders "
@@ -1198,30 +1204,31 @@ msgstr ""
 "horizontale en verticale verversingsfrequenties van uw beeldscherm kiest."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Onjuiste verversingsfrequenties kunnen uw monitor beschadigen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Resolutie</guibutton></emphasis>: Stel hier de gewenste "
 "resolutie en kleurdiepte van uw monitor in."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: De testknop verschijnt "
 "niet altijd bij het installeren. Als de knop er is, kunt u uw instellingen "
@@ -1233,7 +1240,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1242,12 +1249,12 @@ msgstr ""
 "verschillende opties toestaan of uitschakelen."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Beeldscherm (Selecteer een monitor)"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1256,35 +1263,36 @@ msgstr ""
 "gewoonlijk correct identificeren."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Door een monitor met verkeerde kenmerken te selecteren, zou u uw "
 "beelscherm kunnen beschadigen. Probeer a.u.b. niets zonder te weten wat u "
 "doet.</emphasis> Raadpleeg bij twijfel de handleiding van uw monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Aangepast</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1297,7 +1305,7 @@ msgstr ""
 "beeld wordt ververst."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1310,12 +1318,12 @@ msgstr ""
 "terughoudend bij het instellen in geval van twijfel."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1324,12 +1332,12 @@ msgstr ""
 "uw computer nodig heeft om het goed te configureren."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Vendor (producent)</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1338,28 +1346,30 @@ msgstr ""
 "kunt u deze als volgt in de boomstructuur kiezen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "naam van de fabrikant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "naam en type nummer van het beeldscherm"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Algemeen</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "In deze groep kunt u kiezen uit bijna 30 monitorconfiguraties, traditionele, "
 "zoals 1024x768 @ 60Hz, maar ook configuraties voor flat panels, platte "
@@ -1369,12 +1379,12 @@ msgstr ""
 "te zijn met uw keuze."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Aangepaste schijfpartitionering met DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1385,12 +1395,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Als u uw root-partitie (<literal>/</literal>) wilt versleutelen, verzeker u "
 "er dan van dat u een aparte <literal>/boot</literal>-partitie heeft. De "
@@ -1398,43 +1410,44 @@ msgstr ""
 "uw systeem niet opstarten."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Pas hier de partitionering van uw harde schijf of schijven aan. U kunt "
 "partities verwijderen of aanmaken, het bestandssysteem of de grootte van een "
 "partitie wijzigen en zelfs bekijken wat ze bevatten voor u start."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Er is een tabblad voor elke gevonden harde schijf of opslag medium, zoals "
-"een USB-stick. Deze zijn bijvoorbeeld genummerd \"sda\", \"sdb\" en \"sdc\" "
-"als er drie zijn."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Klik op <guibutton>Alles wissen</guibutton> om alle partities op het "
 "geselecteerde opslag apparaat te verwijderen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Voor alle andere acties: Klik eerst op de gewenste partitie. Bekijk het "
 "vervolgens, of kies een bestandssysteem en een koppelpunt, pas de grootte "
@@ -1444,31 +1457,33 @@ msgstr ""
 "partitie type."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Ga verder totdat alles naar uw wensen is aangepast."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik dan op <guibutton>Klaar</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Als u Mageia op een UEFI-systeem installeert, zorg dan dat een ESP (EFI-"
 "Systeem-Partitie) beschikbaar is en aangekoppeld op /boot/EFI (zie hieronder)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1476,12 +1491,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1490,7 +1505,7 @@ msgstr ""
 "opstart-partitie beschikbaar is en daarnaast ook van het juiste type is"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1503,32 +1518,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "In dit scherm kunt u de inhoud van uw harde schijf of schijven zien en de "
 "ruimtes die de DrakX-partitioneringswizard gevonden heeft om "
 "<application>Mageia</application> te installeren."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Welke opties van de lijst hieronder op uw systeem beschikbaar zijn hangt af "
 "van de indeling en de inhoud van uw specifieke harde schijf (schijven)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1541,12 +1558,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Huidige partities gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1555,12 +1572,12 @@ msgstr ""
 "gevonden die gebruikt kunnen worden voor het installeren."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Vrije ruimte gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1569,12 +1586,12 @@ msgstr ""
 "Mageia-installatie wilt gebruiken, kies dan deze optie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Gebruik vrije ruimte op een Windows Partitie"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1583,7 +1600,7 @@ msgstr ""
 "gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1594,7 +1611,7 @@ msgstr ""
 "van al uw belangrijke bestanden een reservekopie heeft!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1612,12 +1629,14 @@ msgstr ""
 "uw persoonlijke bestanden te maken op een andere schijf of lokatie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Bij deze optie is de resterende Windowspartitie lichtblauw en de nieuwe "
 "Mageiapartitie donkerblauw. Eronder ziet u hun voorgestelde groottes. U kunt "
@@ -1625,37 +1644,39 @@ msgstr ""
 "links of rechts te slepen. Zie de schermafbeelding hieronder."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Volledige harde schijf wissen en gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Met deze optie zal de gehele schijf voor Mageia gebruikt worden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Let op! Hierdoor zullen ALLE gegevens op de geselecteerde harde schijf "
 "gewist worden. Wees voorzichtig!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1666,12 +1687,12 @@ msgstr ""
 "verliezen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Aangepaste schijfpartitionering"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1680,67 +1701,80 @@ msgstr ""
 "uw harde schijf of schijven."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Als u dit niet zelf regelt via \"Aangepaste schijfpartitionering\", dan zal "
-"de beschikbare ruimte volgens onderstaande regels gebruikt worden:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Als de totaal beschikbare ruimte kleiner is dan 50 GB, dan wordt slechts één "
 "partitie aangemaakt, voor /, er is geen aparte partitie  voor /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Als er meer dan 50 GB beschikbaar is, dan worden drie partities aangemaakt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "6/19e van de beschikbare ruimte gaat naar /, tot een maximum van 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19e gaat naar de swap-partitie, tot een maximum van 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "de rest (minimaal 12/19e) gaat naar /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Dat betekent dat vanaf 160 GB aan beschikbare ruimte de volgende partities "
 "gemaakt worden: 50 GB /, 4 GB swap en alle overige ruimte gaat naar /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Als u een UEFI-systeem gebruikt, zal het ESP (EFI-systeempartitie) "
 "automatisch gevonden worden, of aangemaakt worden als het nog niet bestaat, "
@@ -1748,17 +1782,17 @@ msgstr ""
 "de enige waarmee kan worden gecontroleerd of het juist gedaan is"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1769,7 +1803,7 @@ msgstr ""
 "\"><imagedata fileref=\"live-doPartitionDisks3.png\"/></imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1778,15 +1812,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Somige nieuwere gegevensdragers hebben nu logische sectoren van 4096 byte, "
 "in plaats van de gebruikelijke 512 byte. Door een gebrek aan beschikbare "
@@ -1797,19 +1832,22 @@ msgstr ""
 "gparted, te partitioneren en de volgende instellingen te gebruiken:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Uitlijnen met\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Vrije ruimte links (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Vergewis u er ook van dat alle partities gecreëerd worden met een even "
 "aantal megabytes."
@@ -1820,7 +1858,7 @@ msgid "Installation from LIVE medium"
 msgstr "Installatie vanaf een Live-medium"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1835,18 +1873,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "De Officiële Documentatie voor Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1858,7 +1896,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1870,7 +1908,7 @@ msgstr ""
 "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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1883,13 +1921,13 @@ msgstr ""
 "verbeteren."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1901,26 +1939,34 @@ msgstr ""
 "u tijdens het installeren maakt."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installeren met DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februari 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1928,7 +1974,7 @@ msgstr "Gefeliciteerd"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1937,7 +1983,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1948,16 +1994,17 @@ msgstr ""
 "verwijderen en uw computer herstarten."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Tijdens het opstarten kunt u in scherm voor de opstartlader kiezen tussen de "
 "besturingssystemen op uw computer (als u er meer dan één heeft)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1966,12 +2013,12 @@ msgstr ""
 "Mageia automatisch geselecteerd en gestart."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Veel plezier!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1986,31 +2033,31 @@ msgstr "Firewall"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2021,20 +2068,18 @@ msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;poort-nummer>/&lt;protocol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2046,7 +2091,7 @@ msgstr ""
 "<emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2056,7 +2101,7 @@ msgstr ""
 "gebruikt."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2065,7 +2110,7 @@ msgstr ""
 "dienst is dus <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2074,7 +2119,7 @@ msgstr ""
 "specificeert u 2 koppels voor dezelfde poort."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatteren"
 
@@ -2083,14 +2128,14 @@ msgstr "Formatteren"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2100,23 +2145,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Hier kunt u aanvinken welke partititie(s) u wilt formatteren. Gegevens op "
 "partities die <emphasis>niet</emphasis> gekozen zijn, zullen bewaard blijven."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Gewoonlijk moeten tenminste de partities die DrakX selecteerde, "
 "geformatteerd worden."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2125,12 +2171,13 @@ msgstr ""
 "wilt controleren op zogenoemde <emphasis>slechte blokken</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Als u niet zeker bent dat u de juiste keuze gemaakt heeft, kunt u op "
 "<guibutton>Vorige</guibutton> klikken tot u terug bent in het eerste "
@@ -2139,7 +2186,7 @@ msgstr ""
 "de rechterkolom kiezen om die te bekijken."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2148,12 +2195,12 @@ msgstr ""
 "uw keus."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, het Mageia-installatieprogramma"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2164,7 +2211,7 @@ msgstr ""
 "ervaren gebruiker bent."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2174,36 +2221,40 @@ msgstr ""
 "nodig heeft."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Allereerste installatiewelkomsscherm"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Een Mageia DVD gebruiken"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "De standaard welkomsschermen van de Mageia-DVD's ziet u hieronder. De eerste "
 "is voor UEFI systemen, de tweede voor oudere (Legacy) systemen:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject><imagedata fileref=\"dx-welcome2.png\"/></imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Vanuit dit scherm kunt u toegang krijgen tot verschillende opties door op de "
 "letter \"e\" te drukken, waarna u de\"bewerkingsmodus\" betreed. Om\n"
@@ -2213,116 +2264,108 @@ msgstr ""
 "tegelijkertijd uw veranderingen op te slaan."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject><imagedata fileref=\"dx-welcome.png\"/></imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"Vanuit dit scherm is het mogelijk om enkele persoonlijke voorkeuren in te "
-"stellen:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"De taal (enkel voor de installatie, deze kan verschillen van de gekozen taal "
-"voor het systeem) door op de F2-toets te drukken (niet in UEFI modus)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr "Selecteer een taal met de pijltoetsen en druk Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Hier is, als voorbeeld, het Franse welkomsscherm van een LiveDVD/CD. Merk op "
-"dat de Live DVD/CD niet de keuzes <guilabel>Rescue System</guilabel>, "
-"<guilabel>Memory test</guilabel> en <guilabel>Hardware Detection Tool</"
-"guilabel> heeft."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "Wijzig de schermresolutie door op F3 te klikken (niet in UEFI-modus)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Voeg kernel opties toe door op de <emphasis role=\"bold\">F6</emphasis>-knop "
-"te klikken in legacymodus of <emphasis role=\"bold\">e</emphasis> te typen "
-"in UEFI-modus."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Default, het verandert niets aan de standaard opties."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Als de installatie faalt, kan het nodig zijn het opnieuw te proberen met een "
-"van de extra opties. Het F6-menu laat een nieuwe regel zien, genaamd "
-"<guilabel>Boot options</guilabel> en heeft vier mogelijkheden:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Default, het verandert niets aan de standaard opties."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), met energiebeheer "
 "wordt geen rekening gehouden."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), betreft "
 "CPU-onderbrekingen, selecteer deze optie als u dat gevraagd wordt."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2331,53 +2374,52 @@ msgstr ""
 "aangepast, die zichtbaar zijn in de <guilabel>Bootopties</guilabel>regel."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "In sommige Mageia uitgaves verschijnen de mogelijkheden die via F6 gekozen "
 "kunnen worden, niet in de <guilabel>Bootopties</guilabel>regel, maar worden "
 "dan toch echt gebruikt."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr "Leer meer kernelopties via F1 (niet in UEFI modus)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Via F1 krijgt u een scherm met meer beschikbare opties. Kies er een met de "
 "pijltjestoetsen en druk op Enter om meer details te krijgen, of klik op de "
 "Esc toets om terug te gaan naar het welkomsscherm."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Het gedetailleerde scherm voor de splash opties. Klik op Esc of kies "
 "<guilabel>Return to Boot Options</guilabel> om weer naar de optieslijst te "
@@ -2385,19 +2427,22 @@ msgstr ""
 "guilabel>regel worden toegevoegd."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "De hulp wordt in de gekozen taal vertaald met de F2 toets."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2407,82 +2452,48 @@ msgstr ""
 "<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> (Engels)."
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Een Bedraad Netwerk gebruiken"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Hier is het standaard welkomsscherm van een kabelnetwerkgebaseerde "
-"Installatie CD (netinstall.iso of netinstall-nonfree.iso "
-"opstartafbeeldingen):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Het staat niet toe de taal hier te wijzigen, de beschikbare opties worden in "
-"het scherm uitgelegd. Zie voor meer informatie over kabelnetwerkgebaseerd "
-"installeren met boot.iso: <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">de Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "De toetsenbordindeling is de Amerikaanse."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject><imagedata fileref=\"../dx-help.png\"/></imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "De Installatiestappen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Het installatieproces is onderverdeeld in stappen, die in het zijpaneel van "
 "de volgende schermen zichtbaar zijn."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Elke stap bevat één of meerdere schermen die ook knoppen met het label "
 "\"<guibutton>Geavanceerd</guibutton>\" kunnen hebben met extra of minder "
 "gebruikelijke opties."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "De meeste schermen hebben \"<guibutton>hulp</guibutton>\" knoppen die meer "
 "uitleg geven over de desbetreffende stap."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2501,17 +2512,17 @@ msgstr ""
 "op <guibutton>Alt Ctrl Delete</guibutton> om opnieuw op te starten."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installatieproblemen en mogelijke oplossingen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Geen grafische interface"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2522,13 +2533,16 @@ msgstr ""
 "resolutie te gebruiken door \"vgalo\" te typen bij de \"boot:\"-prompt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Als de hardware erg oud is, kan het zijn dat een grafische installatie niet "
 "mogelijk is. In dit geval is het de moeite waard een tekstmodusinstallatie "
@@ -2537,12 +2551,12 @@ msgstr ""
 "Typ \"text\" en druk op ENTER. Ga nu verder met installeren in tekstmodus."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Installatieblokkades"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2557,14 +2571,15 @@ msgstr ""
 "beide vorige gecombineerd worden."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM-probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2576,18 +2591,20 @@ msgstr ""
 "RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamische partities"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Als u uw harde schijf van \"basic\" naar \"dynamic\" formaat geconverteerd "
 "heeft in Microsoft Windows, weet dan dat het onmogelijk is Mageia op deze "
@@ -2605,18 +2622,18 @@ msgstr "Updates"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2625,10 +2642,11 @@ msgstr ""
 "kunnen sommige pakketten bijgewerkt of verbeterd zijn."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Kies <guilabel>Ja</guilabel> als u ze wilt ophalen en installeren, kies "
@@ -2636,8 +2654,9 @@ msgstr ""
 "internet verbonden bent."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Klik daarna op <guibutton>Volgende</guibutton> om verder te gaan."
 
 #. type: Content of: <section><info><title>
@@ -2695,18 +2714,18 @@ msgstr "Mediaselectie (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2719,7 +2738,7 @@ msgstr ""
 "in de volgende stappen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2728,7 +2747,7 @@ msgstr ""
 "bevat de basis van de distributie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2743,13 +2762,14 @@ msgstr ""
 "fabriekssoftware voor diverse WiFi kaarten, e.d."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "De <emphasis>Tainted</emphasis> bron bevat pakketten die zijn uitgegeven "
 "onder een vrije licentie. Het belangrijkste criterium om pakketten in deze "
@@ -2759,38 +2779,41 @@ msgstr ""
 "af te spelen."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimale installatie"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "U kunt een minimale installatie kiezen door alles in het "
 "Pakketgroepselectiescherm te deselecteren, zie <xref linkend="
 "\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Indien gewenst, kunt u vervolgens ook \"Individuele pakketselectie\" "
 "aanvinken in hetzelfde scherm."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Minimale installatie is bedoeld voor degenen die <application>Mageia</"
 "application> op een bepaalde manier willen gebruiken, zoals als server of "
@@ -2799,25 +2822,24 @@ msgstr ""
 "aan te passen, zie <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Als u deze installatieklasse kiest, zal het bijbehorende scherm u een aantal "
 "bruikbare extra's bieden om te installeren, zoals documentatie en X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Door \"Met X\" te kiezen, krijgt u tevens IceWM als lichtgewicht "
-"werkomgeving."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2832,15 +2854,15 @@ msgstr ""
 "pagina's."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2857,11 +2879,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX maakte slimme keuzes voor de configuratie van uw systeem, afhankelijk "
 "van de keuzes die u maakte en de apparatuur die DrakX aantrof. U kunt de "
@@ -2870,9 +2893,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Als algemene regel worden de standaardinstellingen aanbevolen en kunt u ze "
 "blijven gebruiken met 3 uitzonderingen:"
@@ -2891,71 +2915,75 @@ msgstr "de standaardinstelling is al geprobeerd en mislukt"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "iets anders wordt gezegd in de gedetailleerde secties hieronder"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Systeeminstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Tijdzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX selecteerde een tijdzone op grond van uw voorkeurstaal. Zie ook <xref "
 "linkend=\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Als u zich niet in het geselecteerde land bevindt, is het erg belangrijk dat "
 "u deze instelling verandert. Zie <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Opstartlader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "DrakX heeft goede keuzes gemaakt voor de instellingen voor de opstartlader."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Verander niets, tenzij u weet hoe u Grub2 dient in te stellen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Zie voor meer infomatie <xref linkend=\"setupBootloader\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gebruikersbeheer</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2964,21 +2992,22 @@ msgstr ""
 "literal> mappen krijgen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Diensten</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systeemdiensten zijn kleine programma's die op de achtergrond draaien "
 "(daemons). Hier kunt u bepaalde daemons activeren of deactiveren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2987,32 +3016,33 @@ msgstr ""
 "uw computer goed werkt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Voor meer informatie, zie <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Apparatuurinstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Toetsenbord</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Hier kunt u uw toetsenbordinstelling veranderen. De omschrijving van het "
 "toetsenbord is afhankelijk van de taal en/of het land waarvoor het ontworpen "
 "werd en vaak ook van het toetsenbordtype."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3021,12 +3051,12 @@ msgstr ""
 "hou dan in gedachten dat uw wachtwoorden ook veranderen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Muis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3035,16 +3065,17 @@ msgstr ""
 "trackballs and touchpads."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Geluidskaart</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Het installatieprogramma kiest het standaardstuurprogramma, als dat bestaat. "
 "De optie om een ander stuurprogramma te kiezen, wordt alleen gegeven als er "
@@ -3052,23 +3083,23 @@ msgstr ""
 "standaardstuurprogramma is."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafische interface</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "Hier kunt u uw grafische kaart(en) en beelscherm(en) instellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Voor meer informatie, zie <xref linkend=\"configureX_chooser\"></xref>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3077,20 +3108,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Netwerk en internetinstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Netwerk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3100,21 +3132,22 @@ msgstr ""
 "configuratiecentrum</application> (MCC)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Als u een netwerkkaart toevoegt, vergeet dan niet uw firewall zo in te "
 "stellen dat hij deze interface ook bewaakt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3125,26 +3158,27 @@ msgstr ""
 "een proxy service gebruikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Mogelijk moet u uw systeembeheerder vragen om de instellingen die u hier "
 "moet invullen."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Beveiliging"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Beveiligingsniveau</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3153,17 +3187,17 @@ msgstr ""
 "is de standaardinstelling (Standaard) geschikt voor algemeen gebruik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Controleer welke optie het beste bij uw gebruik past."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3172,7 +3206,7 @@ msgstr ""
 "boeven daarbuiten op internet die ze zouden willen aantasten of stelen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3183,7 +3217,7 @@ msgstr ""
 "<xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "Denk eraan dat alles toestaan (geen firewall) erg riskant kan zijn."
 
@@ -3252,41 +3286,73 @@ msgstr ""
 "<application>Mageia</application> te installeren."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Beveiligingsniveau"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitie grootte:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Uw beveiligingsniveau kunt u hier aanpassen."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Geavanceerd</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Laat de door DrakX gekozen instellingen staan, als u niet weet wat u kiezen "
-"moet."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Achteraf is het altijd mogelijk uw beveiligingsinstellingen aan te passen in "
 "het <guilabel>Beveiliging</guilabel>sgedeelte van het Mageia-"
@@ -3304,25 +3370,27 @@ msgstr "Introductie"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia is verspreid doormiddel van ISO-afbeeldingen. Deze pagina zult u "
 "helpen bij het kiezen van een afbeelding die aan uw wensen voldoet."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Er zijn twee mediafamilies:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassieke installateur: Nadat het medium is opgestart, zal het een proces "
 "beginnen waarmee u kunt kiezen wat er wordt geïnstalleerd en hoe uw "
@@ -3331,84 +3399,87 @@ msgstr ""
 "installeren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE-medium: bij het opstarten van dit medium verschijnt er een echt Mageia-"
-"systeem zonder dat het wordt geïnstalleerd, zodat u kunt kijken wat u krijgt "
-"nadat u het installeert. Het installatieproces is eenvoudiger, maar u krijgt "
-"minder keuzes."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Details worden gegeven in de volgende secties."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definitie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Hier is een medium (mv: media) een ISO-imagebestand, dat het installeren en/"
 "of updaten van Mageia mogelijk maakt, en voorts elk fysiek medium waar het "
 "ISO-bestand op gekopieerd is."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "U kunt ze <link ns4:href=\"http://www.mageia.org/nl/downloads/\">hier</link> "
 "vinden."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassieke installatiemedia"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Algemene eigenschappen"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Deze ISO's gebruiken het traditionele installatieprogramma, drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "U kunt er een schone installatie mee doen of een oudere installatie mee "
 "actualiseren."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Vershillende media voor 32- en 64-bits architectuur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3417,12 +3488,12 @@ msgstr ""
 "Test, Hardware Detection Tool."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Elke DVD bevat veel beschikbare bureaubladomgevingen en talen."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3430,100 +3501,105 @@ msgstr ""
 "voegen."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Kunnen gebruikt worden om de distributie te testen zonder die op een harde "
 "schijf te installeren. Indien gewenst is installeren wel mogelijk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Elke ISO bevat slechts één werkomgeving (Plasma, GNOME of Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live ISO's kunnen enkel voor schone installaties "
 "gebruikt worden, ze kunnen niet worden gebruikt om een oudere installatie "
 "mee bij te werken.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Ze bevatten niet-vrije software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "PLASMA Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Enkel PLASMA-werkomgeving."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Alle talen zijn aanwezig."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Alleen 64-bits architectuur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "GNOME Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Enkel GNOME werkomgeving."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Alleen 64-bits architectuur"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Xfce Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Enkel Xfce-werkomgeving."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32- en 64-bits architectuur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Enkel-opstart CD-media"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3535,28 +3611,30 @@ msgstr ""
 "station, lokaal netwerk of op internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Deze media zijn erg licht (minder dan 100 MB) en handig bij te geringe "
 "bandbreedte om een volledige DVD te downloaden, een pc zonder DVD-station of "
 "een pc die niet van een USB-stick kan booten."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Enkel de Engelse taal."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3590,11 +3668,12 @@ msgstr "Downloaden"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Zodra u uw ISO-bestand heeft gekozen, kunt u deze downloaden via http of "
 "BitTorrent. In beide gevallen geeft een venster u enige informatie, zoals de "
@@ -3608,10 +3687,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum en sha1sum zijn hulpmiddelen om de integriteit van de ISO te "
 "controleren. Gebruik er maar één van. Bewaar één van hen <link linkend="
@@ -3625,8 +3705,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Vink het selectierondje 'Bestand opslaan' aan."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3634,14 +3714,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "De integriteit van het gedownloade medium controleren"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Beide checksums zijn hexadecimale getallen die door een algoritme voor het "
 "te downloaden bestand berekend zijn. Als u deze checksums opnieuw laat "
@@ -3650,69 +3731,84 @@ msgstr ""
 "overdoen of een reparatie proberen met behulp van BitTorrent. ."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Open een terminal (niet als root), en:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Om md5sum te gebruiken, typ: [sam@localhost]$ <userinput>md5sum pad/naar/"
 "het/image/bestand.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Om sha1sum te gebruiken, typ: [sam@localhost]$ <userinput>sha1sum pad/naar/"
 "het/image/bestand.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"en vergelijk het verkregen getal op uw computer (het kan een tijdje duren "
-"voor het verschijnt) met het getal dat door Mageia gegeven werd. Voorbeeld:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"en vergelijk het verkregen getal op uw computer (het kan een tijdje duren "
+"voor het verschijnt) met het getal dat door Mageia gegeven werd. Voorbeeld:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Brand of dump het ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "De gecontroleerde ISO can nu op een CD of DVD gebrand worden, of worden "
 "gedumpt op een USB-stick. Dit is niet hetzelfde als gewoon kopiëren, maar "
 "zorgt wel dat een opstartbaar medium gemaakt wordt."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "De ISO op een CD/DVD branden"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Gebruik de brander die u wilt, maar verzeker u ervan dat hij correct is "
 "ingesteld op <emphasis role=\"bold\">een image branden</emphasis>, gegevens "
@@ -3721,12 +3817,12 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Dump de ISO op een USB-stick"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3735,18 +3831,19 @@ msgstr ""
 "'dumpen' en dan van die USB-stick op kunt starten en installeren."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "door een beeldbestand op een flash-apparaat te 'dumpen', wist u elk eerder "
 "bestandssysteem; alle aanwezige gegevens zullen verloren gaan en de "
 "capaciteit zal worden gereduceerd tot de grootte van het beeldbestand."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3755,12 +3852,12 @@ msgstr ""
 "partitioneren en formatteren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Gebruik een grafisch hulpmiddel binnen Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3769,73 +3866,72 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Gebruik een grafisch hulpmiddel binnen Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Probeer bijv.:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> met de "
 "\"ISO-image\"-optie;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Gebruik de commandoregel binnen een GNU/Linux-systeem"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Het is potentieel *gevaarlijk* om dit handmatig te doen. Je riskeert het "
 "overschrijven van een schijfpartitie als je het apparaat-ID verkeerd krijgt."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "U kunt ook de dd tool gebruiken in een terminal:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Open een terminal"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Wordt root met het commando <userinput>su -</userinput> (vergeet de '-' aan "
 "het eind niet)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3844,28 +3940,40 @@ msgstr ""
 "bestandsmanager openen die hem zou kunnen bekijken of lezen)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Voer het commando <userinput>fdisk -l</userinput> in"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
+msgid ""
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Vind de naam van uw USB-stick (d.m.v. zijn grootte), bijv. <code>/dev/sdb</"
+"code> in bovenstaande schermafbeelding. Het is een 8GB USB-stick."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "U kunt ook apparaatnamen met het commando <code>dmesg</code> verkrijgen: aan "
 "het eind zult u de apparaatnaam dat begint met <emphasis>sd</emphasis> en "
 "<emphasis>sdd</emphasis> als volgt zien:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3907,46 +4015,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Vind de naam van uw USB-stick (d.m.v. zijn grootte), bijv. <code>/dev/sdb</"
-"code> in bovenstaande schermafbeelding. Het is een 8GB USB-stick."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Geef het commando: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Waar X=apparaatnaam, bijv: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Bijvoorbeeld: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD."
 "iso of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Geef het commando: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Verwijder uw USB-stick, hij is gereed"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3976,19 +4093,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Als uw land niet in de lijst staat, klik dan op de <guilabel>Overige landen</"
 "guilabel> knop en kies uw land daar."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Als uw land alleen in de <guilabel>Overige landen</guilabel> lijst staat kan "
@@ -3997,18 +4116,19 @@ msgstr ""
 "volgen."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Invoermethode"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "In het <guilabel>Overige landen</guilabel> scherm kun je ook een "
@@ -4020,11 +4140,13 @@ msgstr ""
 "media toevoegt voor u de pakketten selecteert."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Als u het instellen van de invoermethode miste tijdens het installeren, kunt "
 "u dat, als u uw geïnstalleerde systeem gestart heeft, alsnog doen via "
@@ -4032,53 +4154,54 @@ msgstr ""
 "beheerder te starten."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installeren of opwaarderen"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installeren"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
-msgstr "Kies dit voor een verse <application>Mageia</application>-installatie."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Opwaarderen"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Als u één of meer <application>Mageia</application>-installaties heeft op uw "
-"systeem, kunt u er één uitkiezen om op te waarderen naar de nieuwste uitgave."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Uitsluitend opwaarderen vanaf een eerdere Mageia versie die <emphasis>nog "
 "ondersteund werd</emphasis> toen deze versie van het installatieprogramma "
@@ -4088,16 +4211,17 @@ msgstr ""
 "literal> partitie bewaart."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Als u tijdens het installeren besluit de installatie af te breken, is het "
 "mogelijk opnieuw op te starten. Denk a.u.b. goed na voordat u dit doet. "
@@ -4110,12 +4234,14 @@ msgstr ""
 "op <guibutton>Alt Ctrl Delete</guibutton> om opnieuw op te starten"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Als u een extra taal vergat te installeren, kunt u nu nog terug van het "
 "\"installeren of opwaarderen\" scherm naar het taalkeuzescherm door "
@@ -4150,12 +4276,12 @@ msgstr ""
 "zojuist geselecteerd heeft, bepaald) is al geselecteerd."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4164,16 +4290,17 @@ msgstr ""
 "dat niet lukt zal hij uitgaan van een VS-toetsenbordindeling (US QWERTY)."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4190,23 +4317,25 @@ msgstr ""
 "wikipedia.org/wiki/Keyboard_layout</link> (Engelstalig)"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Staat uw toetsenbord niet in de lijst die u ziet, klik dan op "
 "<guibutton>Meer</guibutton> om een volledige lijst te krijgen en selecteer "
 "uw toetsenbord daar."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Nadat u een toetsenbord uit het <guibutton>Meer</guibutton> scherm kiest, "
 "keert u terug in het eerste toetsenbordkeuzescherm en zal het lijken alsof "
@@ -4215,23 +4344,24 @@ msgstr ""
 "is die welke u uit de volledige lijst koos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Als u een toetsenbord kiest dat gebaseerd is op niet-Latijnse lettertekens, "
 "krijgt u een extra scherm waarin u kunt aangeven hoe u wilt wisselen tussen "
 "de Latijnse en niet-Latijnse indeling."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Taalkeuze"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4243,7 +4373,7 @@ msgstr ""
 "computer."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4253,12 +4383,13 @@ msgstr ""
 "systeem op uw computer."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Wanneer u meerdere talen op uw systeem wilt gebruiken, voor uzelf of voor "
 "andere gebruikers, klik dan op \"<guibutton>Meerdere talen</guibutton>\" om "
@@ -4266,7 +4397,7 @@ msgstr ""
 "talen toe te voegen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4278,18 +4409,19 @@ msgstr ""
 "\"live\"><imagedata fileref=\"live-language.png\" format=\"\"/></imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Zelfs als u meer dan één taal kiest, moet één van hen als voorkeurstaal "
 "gekozen worden in het eerste taalscherm. Deze zal ook aangevinkt zijn in het "
 "\"Meerdere talen\" scherm. ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4298,23 +4430,24 @@ msgstr ""
 "later tijdens de installatie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia gebruikt standaard UTF-8 (Unicode) ondersteuning."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Als u weet dat deze niet geschikt is voor één van uw talen, kan zij "
 "onderdrukt worden in het \"Meerdere talen\" scherm, door voor de oude "
 "compatibiliteit te kiezen. Die is dan van toepassing op al uw talen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4369,71 +4502,76 @@ msgstr ""
 "of meer knoppen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Wijzig een opstartmenu-ingang of voeg er een toe"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Om dat te doen moet u handmatig /boot/grub2/custom.cfg bewerken of  in "
 "plaats van dat de software grub-customizer gebruiken (Verkrijgbaar in de "
 "bronnen van Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Voor meer informatie, zie onze wiki: <link ns2:href=\"https://wiki.mageia."
 "org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Opstartlader Interface"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Mageia gebruikt standaard uitsluitend:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (met of zonder grafische menu) voor een Legacy/MBR of Legacy/GPT-"
 "systeem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi voor een UEFI systeem."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "De Mageia grafische menu's zijn mooi :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 op Legacy/MBR en Legacy/GPT systemen"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4446,27 +4584,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi op UEFI systemen"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Bij een UEFI-systeem is de gebruikersinterface iets anders, u kunt namelijk "
 "niet kiezen of u wel of niet een grafische menu wilt"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4479,14 +4622,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Als uw computer naast Mageia geen ander besturingssysteem had, dan heeft het "
@@ -4499,36 +4643,41 @@ msgstr ""
 "besturingssystemen dat u heeft."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "De Mageia-opstartlader gebruiken"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Afhankelijk van uw systeem schrijft Mageia standaard een nieuw:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 opstartlader ofwel in de MBR (Master Boot Record) van uw eerste harde "
 "schijf of in de BIOS-opstart-partitie."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi opstartlader in de ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Als u al andere besturingssystemen heeft geïnstalleerd, zal Mageia proberen "
 "om ze toe te voegen aan uw nieuwe Mageia opstartmenu. Als u dit niet wilt, "
@@ -4536,7 +4685,7 @@ msgstr ""
 "bij het vakje <guilabel>Peil Onbekend OS</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4549,18 +4698,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Een bestaande opstartlader gebruiken"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "De precieze procedure om Mageia aan een bestaande opstartlader toe te "
 "voegen, valt buiten het bereik van dit document. In de meeste gevallen is "
@@ -4569,16 +4719,17 @@ msgstr ""
 "documentatie van het betreffende besturingssysteem."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Met behulp van opeenvolgend laden"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Als u niet wilt dat een uw computer direct Mageia opstart, maar via een "
 "keten laad van een ander OS, klik dan <guibutton>Volgende</guibutton> en "
@@ -4586,7 +4737,7 @@ msgstr ""
 "<guilabel>ESP of MBR niet aanraken</guilabel> aan."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4599,7 +4750,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4608,7 +4759,7 @@ msgstr ""
 "door te klikken op <guibutton>Oke</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4617,33 +4768,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opties"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Eerste pagina"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Vertraging voordat de beeldkopie (image) standaard wordt "
 "opgestart</guilabel>: In dit tekstvak kunt u de vertraging in seconden "
 "instellen voordat het standaard besturingssysteem wordt opgestart."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Beveiliging</guilabel>: Hiermee kunt u een wachtwoord instellen "
 "voor de opstartlader. Dit betekent dat een gebruikersnaam en wachtwoord "
@@ -4652,38 +4804,38 @@ msgstr ""
 "hierna wordt het wachtwoord gekozen."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Wachtwoord</guilabel>: Dit is het tekstvak waar u uw wachtwoord "
 "invoert"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Wachtwoord (nogmaals)</guilabel>: Herhaal het wachtwoord en DrakX "
 "zal controleren of het overeenkomt met het wachtwoord dat hierboven is "
 "ingevoerd."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Gevorderd</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI Inschakelen:</guilabel> ACPI (Advanced Configuration and "
 "Power Interface) is een standaard voor energiebeheer. Het kan energie "
@@ -4694,9 +4846,10 @@ msgstr ""
 "systeem willekeurige opnieuw opstart of vastloopt)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP Inschakelen</guilabel>: Deze optie maakt het mogelijk om "
@@ -4704,12 +4857,12 @@ msgstr ""
 "juist uit te schakelen."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC Inschakelen</guilabel>: Het In- of uitschakelen van dit geeft "
 "het besturingssysteem toegang tot de Advanced Programmable Interrupt "
@@ -4717,27 +4870,28 @@ msgstr ""
 "Geavanceerde IRQ (Verzoek voor Onderbreking) beheer toe."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Lokale APIC Inschakelen</guilabel>: Hiermee kunt u de lokale APIC "
 "instellen, dit beheert alle externe onderbrekingen voor een aantal "
 "specifieke processoren in een SMP-systeem."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Volgende pagina"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr "<guilabel>Standaard:</guilabel> Besturingssysteem standaard opgestart"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4747,7 +4901,7 @@ msgstr ""
 "te geven."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4756,11 +4910,12 @@ msgstr ""
 "\"setupMageiaBootloader\">Met behulp van de Mageia opstartlader</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Video modus:</guilabel> Dit stelt de grootte van het scherm en de "
 "kleurdiepte in die het opstartmenu zal gebruiken. Als u klikt op de "
@@ -4768,7 +4923,7 @@ msgstr ""
 "grootte en kleurdiepte kiezen."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4778,7 +4933,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Harde schijf detectie"
 
@@ -4791,35 +4946,38 @@ msgstr "Harde schijf detectie"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX herkent harde schijven gewoonlijk correct, maar het kan zijn dat hij "
 "sommige oudere SCSI-schijfcontrollers niet herkent en daardoor verzuimt de "
 "benodigde drivers te installeren."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Als dit gebeurt, moet u DrakX vertellen welke SCSI controller(s) u heeft."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX zou deze dan goed moeten instellen."
 
@@ -4840,10 +4998,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "In dit scherm ziet u de naam van het stuurprogramma dat DrakX koos voor uw "
 "geluidskaart. Het is het standaardstuurprogramma als we dat hebben."
@@ -4865,42 +5023,47 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Klik vervolgens in het draksound- of \"Audioconfiguratie\"-scherm op "
 "<guibutton>Gevanceerd</guibutton> en dan op <guibutton>Probleemaanpak</"
 "guibutton> voor zeer bruikbaar advies om het probleem op te lossen."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Geavanceerd"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Tijdens installatie, in dit scherm, op <guibutton>Geavanceerd</guibutton> "
 "klikken is zinvol als er geen standaardstuurprogramma is en er meerdere "
 "stuurprogramma's beschikbaar zijn, maar u denkt dat de verkeerde gekozen is."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "In dat geval kunt u een ander stuurprogramma selecteren door te klikken op "
 "<guibutton>Een stuurprogramma uitzoeken</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Bevestig het formatteren van de harde schijf"
 
@@ -4911,13 +5074,13 @@ msgstr "Bevestig het formatteren van de harde schijf"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4927,17 +5090,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klik op <guibutton>Vorige</guibutton> als u niet zeker bent van uw keuze."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klik op <guibutton>Volgende</guibutton> als u het zeker weet en elke "
 "partitie, elk besturingssysteem en alle gegevens op deze harde schijf wilt "
@@ -5060,44 +5226,42 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia deïnstalleren"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Howto"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Mageia bevalt u niet of het lukte niet het correct te installeren, kortom: u "
 "wil er vanaf. Dat is uw recht en Mageia geeft u ook de mogelijkheid om de "
 "installatie ongedaan te maken. Dat geldt niet voor elk besturingssysteem."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Maak eerst een backup van uw gegevens. Start daarna op vanaf uw Mageia "
 "installatie DVD en selecteer Rescue system, dan, Restore Windows boot "
 "loader. Voortaan heeft u enkel Windows bij het opstarten, zonder optie om uw "
 "besturingssysteem te kiezen."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Om de ruimte terug te krijgen die door de Mageia partities werd gebruikt, "
 "klik op <code>Start -> Control Panel -> Administrative Tools -> Computer "
@@ -5107,8 +5271,8 @@ msgstr ""
 "schijf. Rechtsklik op elk van deze partities en kies <guibutton>Delete</"
 "guibutton>. De ruimte komt beschikbaar."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5116,14 +5280,15 @@ msgstr ""
 "Bij XP kon u een nieuwe partitie maken en die formatteren (FAT32 of NTFS). "
 "De partitie kreeg een partitie letter."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Als u Vista or 7 heeft, heeft u nog een mogelijkheid: u kunt de partitie "
 "links van de vrije ruimte vergroten.  Er zijn andere partitioneringstools "
@@ -5175,3 +5340,336 @@ msgid ""
 msgstr ""
 "De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit "
 "duurt enige minuten. Dan ziet u een poos een blanco scherm, dat is normaal."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Wachtwoord (nogmaals)</guilabel>: Herhaal het "
+#~ "gebruikerswachtwoord in dit tekstvak en DrakX zal controleren of beide "
+#~ "wachtwoorden gelijk zijn."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Daarnaast kunt u een gastaccount activeren of deactiveren."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Alles dat een gast met een standaard <emphasis>rbash</emphasis> "
+#~ "gastaccount opslaat in zijn /home map zal gewist worden als hij zich "
+#~ "afmeldt. Zijn belangrijke gegevens kan hij het beste op een USB pen "
+#~ "zetten."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Activeer het 'gast'-account</guilabel>: Zet hier een vinkje om "
+#~ "een gastaccount te maken. Het gastaccount maakt het mogelijk dat een gast "
+#~ "inlogt op de pc en hem gebruikt, maar hij heeft beperktere toegang dan "
+#~ "een gewone gebruiker."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Groep-ID</guilabel>: Hier kan de groep-ID ingevoerd worden, ook "
+#~ "een getal, gewoonlijk hetzelfde als voor de gebruiker.  Laat dit vak "
+#~ "leeg, tenzij u weet wat u doet."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Apparaat\" is samengesteld uit: \"harde schijf\", [\"harde schijf nummer"
+#~ "\"(letter)], \"partitienummer\" (bijvoorbeeld, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Werkstation."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafische omgeving."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Er zijn vier groepen, klik op het driehoekje voor een groep om hem uit te "
+#~ "vouwen en alle diensten erin te zien."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Als u de kaart niet in de Vendor-lijst kunt vinden (omdat ze zich nog "
+#~ "niet in de gegevensbank bevindt of omdat het een oudere kaart is), vindt "
+#~ "u mogelijk een geschikt stuurprogramma in de Xorg categorie."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Er is een tabblad voor elke gevonden harde schijf of opslag medium, zoals "
+#~ "een USB-stick. Deze zijn bijvoorbeeld genummerd \"sda\", \"sdb\" en \"sdc"
+#~ "\" als er drie zijn."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Als u dit niet zelf regelt via \"Aangepaste schijfpartitionering\", dan "
+#~ "zal de beschikbare ruimte volgens onderstaande regels gebruikt worden:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Uitlijnen met\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Vrije ruimte links (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Vanuit dit scherm is het mogelijk om enkele persoonlijke voorkeuren in te "
+#~ "stellen:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "De taal (enkel voor de installatie, deze kan verschillen van de gekozen "
+#~ "taal voor het systeem) door op de F2-toets te drukken (niet in UEFI modus)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Hier is, als voorbeeld, het Franse welkomsscherm van een LiveDVD/CD. Merk "
+#~ "op dat de Live DVD/CD niet de keuzes <guilabel>Rescue System</guilabel>, "
+#~ "<guilabel>Memory test</guilabel> en <guilabel>Hardware Detection Tool</"
+#~ "guilabel> heeft."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Voeg kernel opties toe door op de <emphasis role=\"bold\">F6</emphasis>-"
+#~ "knop te klikken in legacymodus of <emphasis role=\"bold\">e</emphasis> te "
+#~ "typen in UEFI-modus."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Als de installatie faalt, kan het nodig zijn het opnieuw te proberen met "
+#~ "een van de extra opties. Het F6-menu laat een nieuwe regel zien, genaamd "
+#~ "<guilabel>Boot options</guilabel> en heeft vier mogelijkheden:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr "Leer meer kernelopties via F1 (niet in UEFI modus)"
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Een Bedraad Netwerk gebruiken"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Hier is het standaard welkomsscherm van een kabelnetwerkgebaseerde "
+#~ "Installatie CD (netinstall.iso of netinstall-nonfree.iso "
+#~ "opstartafbeeldingen):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Het staat niet toe de taal hier te wijzigen, de beschikbare opties worden "
+#~ "in het scherm uitgelegd. Zie voor meer informatie over "
+#~ "kabelnetwerkgebaseerd installeren met boot.iso: <link ns2:href=\"https://"
+#~ "wiki.mageia.org/en/Boot.iso_install\">de Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "De toetsenbordindeling is de Amerikaanse."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject><imagedata fileref=\"../dx-help.png\"/></imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Door \"Met X\" te kiezen, krijgt u tevens IceWM als lichtgewicht "
+#~ "werkomgeving."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Uw beveiligingsniveau kunt u hier aanpassen."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Laat de door DrakX gekozen instellingen staan, als u niet weet wat u "
+#~ "kiezen moet."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE-medium: bij het opstarten van dit medium verschijnt er een echt "
+#~ "Mageia-systeem zonder dat het wordt geïnstalleerd, zodat u kunt kijken "
+#~ "wat u krijgt nadat u het installeert. Het installatieproces is "
+#~ "eenvoudiger, maar u krijgt minder keuzes."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Enkel-opstart CD-media"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Vink het selectierondje 'Bestand opslaan' aan."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "U kunt ook de dd tool gebruiken in een terminal:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Verwijder uw USB-stick, hij is gereed"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Kies dit voor een verse <application>Mageia</application>-installatie."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Als u één of meer <application>Mageia</application>-installaties heeft op "
+#~ "uw systeem, kunt u er één uitkiezen om op te waarderen naar de nieuwste "
+#~ "uitgave."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Howto"
diff --git a/docs/docs/stable/installer/pl.po b/docs/docs/stable/installer/pl.po
index 6e3ab8a3..fa7a8b67 100644
--- a/docs/docs/stable/installer/pl.po
+++ b/docs/docs/stable/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-02-10 17:18+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -33,12 +33,13 @@ msgstr "Licencja oraz informacje o wydaniu"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -72,8 +73,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Aby zaakceptować po prostu wybierz <guilabel>Akceptuj</guilabel> i kliknij "
@@ -96,22 +98,23 @@ msgstr "Informacje o Wydaniu"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Aby zobaczyć co nowego w tym wydaniu <application>Mageia</application>, "
 "Kliknij <guibutton>Informacje na temat wydania</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "pl"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)"
 
@@ -119,23 +122,25 @@ msgstr "Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Ten ekran pokazuje listę znalezionych nośników. Możesz dodać inne nośniki "
 "instalacyjne, jak dysk cd/dvd lub zdalny serwer sieciowy. Wybór źródeł "
@@ -143,25 +148,27 @@ msgstr ""
 "następnych kroków."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Dla nośników sieciowych, wymagane są dwa kroki:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr ""
 "Wybór i aktywacja połączenia sieciowego, jeśli jeszcze nie zostało "
 "ustanowione."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Wybór mirrora lub podanie adresu URL. Wybierając mirror masz dostęp do "
 "wszystkich repozytoriów udostępnianych przez Mageię, jak Nonfree, Tainted "
@@ -169,14 +176,15 @@ msgstr ""
 "swój własny mirror np. NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Jeśli aktualizujesz 64-bitową instalację która może zawierać 32-bitowe "
 "paczki, zaleca się w tym kroku dodać serwer lustrzany online poprzez "
@@ -192,7 +200,7 @@ msgstr "Zarządzanie użytkownikami"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,21 +209,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ustawienie hasła administratora (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Wskazane jest, aby ustawić hasło administratora (root) w każdej instalacji "
 "<application>Magei</application>.  Gdy wpisujesz hasło zmienia się kolor "
@@ -225,25 +233,28 @@ msgstr ""
 "poniżej."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "We wszystkich hasłach rozróżniane są duże i małe litery, najlepiej użyć "
 "hasła zawierającego litery (duże i małe), numery oraz inne znaki."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Dodaj użytkownika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Tutaj dodajemy użytkownika. Użytkownik ma mniejsze uprawnienia od "
 "administratora (root), ale wystarczające, aby przeglądać Internet, używać "
@@ -251,7 +262,7 @@ msgstr ""
 "które wykonuje na swoim komputerze przeciętny użytkownik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -259,7 +270,7 @@ msgstr ""
 "<guibutton>Ikona</guibutton>: użycie tego przycisku zmieni ikonę użytkownika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -268,10 +279,11 @@ msgstr ""
 "pola tekstowego"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Nazwa użytkownika</guilabel>: Tutaj wpisz nazwę użytkownika - "
@@ -280,119 +292,95 @@ msgstr ""
 "ma znaczenie.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Hasło</guilabel>: W tym polu wpisz hasło użytkownika. Pojawi się w "
 "nim ikonka tarczy, która oznacza siłę hasła (Zobacz również <xref linkend="
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Hasło (powtórnie)</guilabel>: Wpisz powtórnie hasło użytkownika w "
 "tym polu, instalator sprawdzi czy hasła się zgadzają."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Ustawienia dostępu mogą być również zmienione po instalacji."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Zaawansowane Zarządzanie Użytkownikami"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Po kliknięciu na przycisk <guibutton>Zaawansowane</guibutton> będziesz miał "
 "możliwość edycji ustawień dla użytkownika którego dodajesz."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Dodatkowo, możesz włączyć lub wyłączyć konto gościa"
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Wszystkie dane, które zapisze w swoim katalogu domowym gość zostaną "
-"wykasowane po jego wylogowaniu. Gość musi zapisywać ważne pliki na USB."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Aktywuj konto gościa</guilabel>: Tutaj aktywujesz lub deaktywujesz "
-"konto gościa. Konto gościa pozwala na zalogowanie się i używanie komputera "
-"przez gości, ale posiada mniejsze uprawnienia niż zwykły użytkownik."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Powłoka</guilabel>: Ta lista pozwala na zmianę powłoki używanej "
 "przez użytkownika, którego dodajesz, do wyboru Bash, Dash oraz Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>User ID</guilabel>: Tutaj możesz ustawić ID dla użytkownika "
 "którego dodałeś w poprzednim ekranie. Jest to numer. Zostaw puste, chyba że "
 "wiesz, co robisz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Group ID</guilabel>: Pozwala to ustawić ID grupy. Także numer, "
-"zwykle taki sam jak dla użytkownika. Zostaw puste, chyba że wiesz, co robisz."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
@@ -409,13 +397,14 @@ msgstr "Wybierz punkty montowania"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -425,7 +414,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -436,41 +425,45 @@ msgstr ""
 "DrakX</application>, możesz zmienić punkty montowania."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Jeśli cokolwiek zmienisz, upewnij się że wciąż masz partycję <literal>/</"
 "literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Każda partycja jest ukazana jako: \"Urządzenie\" (\"Pojemność\", \"Punkt "
 "montowania\", \"Typ\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Urządzenie\" jest przedstawione jako: \"dysk twardy\", [\"litera dysku\"], "
-"\"numer partycji\" (dla przykładu: \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Jeśli masz wiele partycji, możesz wybrać wiele różnych punktów montowania z "
 "listy rozwijalnej, takich jak <literal>/</literal>, <literal>/home</literal> "
@@ -479,27 +472,29 @@ msgstr ""
 "literal> dla partycji na której chcesz przechowywać swoje filmy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Możesz pozostawić punkt montowania pusty dla partycji, do których nie chcesz "
 "mieć dostępu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
 "and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
 "that follows, you can click on a partition to see its type and size."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -762,8 +757,9 @@ msgstr "Wybór pulpitu"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "W zależności  od wyboru którego tutaj dokonasz, możesz zobaczyć dalsze "
@@ -771,8 +767,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -789,14 +786,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Wybierz środowisko graficzne <application>KDE</application> lub "
 "<application>Gnome</application>.  Oba z nich zawierają pełny zestaw "
@@ -821,8 +820,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -833,24 +833,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Stacja robocza"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Serwer"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Środowisko graficzne"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Samodzielny wybór pakietów: możesz zaznaczyć tą opcję jeśli chcesz "
 "samodzielnie dodawać lub usuwać pakiety."
@@ -858,35 +862,37 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Samodzielny wybór pakietów"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Tutaj możesz dodawać lub usuwać jakie tylko chcesz pakiety, aby dostosować "
 "instalację do swoich potrzeb."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -901,47 +907,46 @@ msgstr ""
 "wczytanie pliku."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfiguracja usług"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
 "\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Tutaj możesz ustawić które usługi powinny (nie) włączać się kiedy "
 "uruchamiasz system."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Są tutaj cztery grupy, kliknij na trójkąt przed grupą aby rozszerzyć ją i "
-"zobaczyć wszystkie usługi wchodzące w jej skład."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Ustawienia, które wybierze DrakX zwykle są dobre."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -950,7 +955,7 @@ msgstr ""
 "poniżej."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Zmień to tylko i wyłącznie wtedy, kiedy wiesz co robisz."
 
@@ -963,12 +968,13 @@ msgstr "Konfiguruj strefę czasową"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -978,18 +984,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Wybierz swoją strefę czasową poprzez wybranie swojego kraju lub miasta w "
 "pobliżu w tej samej strefie czasowej."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "W następnym kroku możesz wybrać ustawienie zegara sprzętowego, na czas "
 "lokalny lub UTC."
@@ -1004,23 +1012,24 @@ msgstr ""
 "upewnij się, że wszystkie mają ustawiony czas lokalny, albo UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Wybierz System Graficzny (Skonfiguruj swoją Kartę Graficzną)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1029,7 +1038,7 @@ msgstr ""
 "zidentyfikuje twoje urządzenie wideo poprawnie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1038,37 +1047,30 @@ msgstr ""
 "kartę posiadasz, możesz wybrać jedną za pomocą:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "dostawca"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "następnie nazwa karty"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "oraz typ karty"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Jeżeli nie potrafisz znaleźć swojej karty graficznej na liście (ponieważ "
-"jeszcze nie ma jej w bazie danych lub jest starszą kartą) możesz znaleźć "
-"działający sterownik w katalogu Xorg."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Listing Xorg dostarcza więcej jak 40 zamkniętych oraz otwartych sterowników "
 "do kart graficznych. Jeżeli wciąż nie potrafisz znaleźć nazwanego sterownika "
@@ -1076,68 +1078,71 @@ msgstr ""
 "dostarcza podstawowe funkcje."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Bądź ostrożny, ponieważ jeśli wybierzesz niekompatybilny sterownik możesz "
 "posiadać dostęp tylko do interfejsu tekstowego."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Niektórzy producenci kart graficznych udostępniają własnościowe sterowniki "
 "dla Linuksa, które mogą być umieszczone jedynie w repozytorium Nonfree, w "
 "niektórych przypadkach są one dostępne jedynie na stronie producenta."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Aby je zainstalować musi być włączone repozytorium Nonfree. Jeśli nie "
 "włączono tego repozytorium wcześniej, należy je włączyć po ponownym "
 "uruchomieniu komputera."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfiguracja Karty Graficznej i Monitora"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1146,86 +1151,88 @@ msgstr ""
 "kartę graficzną z listy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Niepoprawna wartość odświeżania może uszkodzić monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
+"<emphasis><guibutton>Karta graficzna</guibutton></emphasis>: Wybierz swoją "
+"kartę graficzną z listy."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Wybór monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Własny</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1234,7 +1241,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1243,61 +1250,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "nazwa producenta monitora"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "Opis monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1305,12 +1313,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Jeśli chcesz zaszyfrować swoją partycję <literal>/</literal> musisz się "
 "upewnić że posiadasz oddzielną partycję <literal>/boot</literal>. Partycja "
@@ -1318,74 +1328,73 @@ msgstr ""
 "to uruchomienie systemu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Dla każdego wykrytego dysku lub innego urządzenia, jak USB, prezentowana "
-"jest oddzielna karta. Na przykład sda, sdb i sdc jeśli zostały wykryte trzy "
-"urządzenia."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Kliknij <guibutton>Wyczyść wszystko</guibutton>, aby usunąć wszystkie "
 "partycje znajdujące się na wybranym dysku."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Dla wszystkich innych działań: najpierw kliknij na wybraną partycję. "
 "Następnie możesz wybrać system plików, punkt montowania, zmienić rozmiar lub "
 "ją usunąć."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 "Kontynuuj aż do momentu gdy skonfigurujesz wszystko zgodnie ze swoimi "
 "preferencjami."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -1393,19 +1402,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1419,31 +1428,33 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partycjonowanie"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Na tym ekranie możesz zobaczyć zawartość twoich twardych dysków oraz "
 "propozycje instalatora dotyczące instalacji <application>Magei</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Opcje dostępne na liście poniżej są zależne od podziału twojego dysku "
 "twardego oraz jego zawartości."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1457,12 +1468,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Użyj istniejących partycji"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1471,12 +1482,12 @@ msgstr ""
 "linuksowe i mogą być użyte do instalacji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Wykorzystaj wolne miejsce"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1485,12 +1496,12 @@ msgstr ""
 "wykorzystane do instalacji Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Wykorzystaj wolne miejsce na partycji Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1499,7 +1510,7 @@ msgstr ""
 "zaproponuje, aby je wykorzystać."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1510,7 +1521,7 @@ msgstr ""
 "kopię zapasową ważnych plików!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1527,22 +1538,23 @@ msgstr ""
 "wskazane jest zrobienie kopii zapasowej ważnych plików."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -1550,22 +1562,23 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Wymaż i wykorzystaj cały dysk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Ta opcja użyje całego dysku dla Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1575,13 +1588,13 @@ msgstr ""
 "dysku dane, których nie chcesz stracić, nie używaj tej opcji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1589,84 +1602,97 @@ msgstr ""
 "Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Instalator podzieli obecną przestrzeń odnosząc się do następujących zasad:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Jeżeli całkowita dostępna przestrzeń jest mniejsza niż 50GB, to tylko jedna "
 "partycja zostanie utworzona dla /, nie ma oddzielnej partycji dla /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Jeżeli całkowita dostępna przestrzeń wynosi więcej niż 50GB, to zostaną "
 "utworzone trzy partycje"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 całkowitej dostępnej przestrzeni zostaje przydzielona do /, jednak "
 "maksimum wynosi 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "Cała reszta (conajmniej 12/19) zostanie przydzielone dla /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Oznacza to, że z 160 GB lub więcej dostępnej przestrzeni instalator utworzy "
 "trzy partycje: 50GB dla /, 4GB dla swap i całą resztę dla /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1679,22 +1705,23 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Niektóre nowe dysku używają 4096 bitowych sektorów logicznych, zamiast "
 "wcześniej standardowych 512 bitowych. Z powodu braku takiego sprzętu, "
@@ -1703,19 +1730,22 @@ msgstr ""
 "pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr ""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr ""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis>Dostawca</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Należy się także upewnić, aby wszystkie utworzone partycje miały parzystą "
 "liczbę megabajtów."
@@ -1726,7 +1756,7 @@ msgid "Installation from LIVE medium"
 msgstr "Instalacja z trybu Live"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1741,18 +1771,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Oficjalna Dokumentacja dla Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1764,7 +1794,7 @@ msgstr ""
 "org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1776,7 +1806,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1788,13 +1818,13 @@ msgstr ""
 "wiki.mageia.org/en/Documentation_team\">Zespołem Dokumentacji</link>, "
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1806,26 +1836,34 @@ msgstr ""
 "wyborów dokonasz podczas instalacji."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalacja za pomocą DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Luty 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1833,14 +1871,14 @@ msgstr "Gratulacje"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1851,26 +1889,26 @@ msgstr ""
 "komputer ponownie."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1886,31 +1924,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1922,21 +1960,19 @@ msgstr "<emphasis>Dostawca</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Własny</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1944,28 +1980,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatowanie"
 
@@ -1974,14 +2010,14 @@ msgstr "Formatowanie"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1991,24 +2027,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Tutaj możesz wybrać, które partycje chcesz sformatować. Wszystkie dane na "
 "partycjach <emphasis>nie</emphasis> zaznaczonych do formatowania zostaną "
 "zachowane."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Zazwyczaj przynajmniej te partycje, które zaznaczył instalator, powinny być "
 "sformatowane"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2017,12 +2054,13 @@ msgstr ""
 "mają zostać sprawdzone na obecnoś tzw. <emphasis>bad bloków</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Jeśli nie jesteś pewien swojego wyboru, możesz kliknąć <guibutton>Wstecz</"
 "guibutton>, jeszcze raz <guibutton>Wstecz</guibutton>, a następnie "
@@ -2031,7 +2069,7 @@ msgstr ""
 "partycjach."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2040,12 +2078,12 @@ msgstr ""
 "guibutton> aby kontynuować."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX instalator Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2056,7 +2094,7 @@ msgstr ""
 "aktualizację łatwą i przyjemną. "
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2066,103 +2104,97 @@ msgstr ""
 "potrzebujesz."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Ekran powitalny instalatora"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Używanie bootloader'a Magei"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, fuzzy
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, fuzzy
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr ""
-"Już na pierwszym ekranie instalatora można ustawić niektóre parametry "
-"instalacji:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"Język (tylko dla procesu instalacji, może być inny niż ten, który wybierzesz "
-"dla zainstalowanego systemu) poprzez wciśnięcie klawisza F2"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
-#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Użyj strzałek aby wybrać język i naciśnij ENTER."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Dla przykładu zaprezentowany jest ekran powitalny w języku francuskim, "
-"pochądzący z wersji LiveDVD. Zauważ, że menu LiveCD/DVD nie zawiera pozycji:"
-"<guilabel>System ratunkowy</guilabel>, <guilabel>Test pamięci</guilabel> "
-"oraz <guilabel>Program do detekcji sprzętu</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:67
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Użyj strzałek aby wybrać język i naciśnij ENTER."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr " Aby zmienić rozdzielczość ekranu wciśnij F3."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2170,64 +2202,64 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Możesz dodać parametry dla jądra za pomocą klawisza<emphasis role=\"bold"
-"\">F6</emphasis> lub klawisza <emphasis role=\"bold\">e</emphasis> w trybie "
-"UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Domyślne - nie zmienia żadnej z domyślnych opcji."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Jeśli instalacja się nie powiedzie, może zajść potrzeba uruchomienia jej z "
-"jedną z tych dodatkowych opcji. Menu wywoływane klawiszem F6 wyświetli nam "
-"nową linię <guilabel>Opcje uruchamiania</guilabel> oraz zaproponuje cztery "
-"opcje:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Domyślne - nie zmienia żadnej z domyślnych opcji."
+"- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
+"wydajności."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr "- Bez ACPI - bez zarządzania energią."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr "- Bez lokalnego APIC - ma związek z przerwaniami procesora."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2235,20 +2267,16 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2256,16 +2284,16 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2273,90 +2301,63 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Etapy instalacji"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Proces instalacji jest podzielony na kilka etapów, możesz je śledzić po "
 "lewej stronie ekranu instalatora."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Każdy etap zawiera jeden lub więcej ekranów, które mogą także mieć przycisk "
 "<guibutton>Zaawansowane</guibutton>, który umożliwia dostęp do rzadziej "
 "używanych opcji."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Większość ekranów posiada przycisk <guibutton>Pomoc</guibutton>, który "
 "pozwala na zapoznanie się z wyjaśnieniami dotyczącymi aktualnego etapu "
 "instalacji."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2375,17 +2376,17 @@ msgstr ""
 "zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemy z instalacją oraz możliwe rozwiązania"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Brak graficznego interfejsu"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2396,22 +2397,24 @@ msgstr ""
 "użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Zawieszenie się instalacji"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2425,14 +2428,15 @@ msgstr ""
 "łączona z innymi opcjami jeśli zajdzie taka potrzeba."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problem z pamięcią RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2443,18 +2447,19 @@ msgstr ""
 "pamięci RAM wyrażoną w MB, np. <code>mem=256M</code> oznacza 256MB."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamiczne partycje"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2467,10 +2472,11 @@ msgstr "Aktualizacje"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
@@ -2478,7 +2484,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2487,10 +2493,11 @@ msgstr ""
 "udostępniona, niektóre pakiety zostały zaktualizowane lub poprawione."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Wybierz <guilabel>tak</guilabel> jeśli chcesz je pobrać i zainstalować, "
@@ -2498,8 +2505,9 @@ msgstr ""
 "nie masz połączenia z Internetem"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Kliknij <guibutton>Dalej</guibutton> aby kontynuować"
 
 #. type: Content of: <section><info><title>
@@ -2555,18 +2563,18 @@ msgstr "Wybór nośników (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2579,7 +2587,7 @@ msgstr ""
 "następnych krokach."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2588,7 +2596,7 @@ msgstr ""
 "zawiera ono podstawowe pakiety dystrybucji."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2603,13 +2611,14 @@ msgstr ""
 "firmware dla niektórych kart WIFI, itp."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Repozytorium <emphasis>Tainted</emphasis> zawiera pakiety wydane na wolnych "
 "licencjach. Głównym powodem umieszczenia tych pakietów w tym repozytorium "
@@ -2618,56 +2627,58 @@ msgstr ""
 "DVD, itp."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimalna instalacja"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Możesz przeprowadzić Minimalną instalację poprzez odznaczenie wszystkich "
 "grup pakietów na ekranie Wybór grup pakietów, zobacz <xref linkend="
 "\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Jeśli wybierzesz ten typ instalacji, zostanie ci zaprezentowanych kilka "
 "użytecznych opcji, jak dokumentacja czy X Window."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2677,15 +2688,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2702,17 +2713,17 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2727,199 +2738,199 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parametry systemu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Strefa czasowa</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Kraj / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>System rozruchowy</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Usługi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parametry sprzętu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klawiatura</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mysz</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Karta dźwiękowa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sieć</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2927,48 +2938,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Poziom Bezpieczeństwa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2976,7 +2987,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -3030,39 +3041,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Poziom bezpieczeństwa"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3079,223 +3123,228 @@ msgstr "Wprowadzenie"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Nośnik"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definicja"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klasyczne medium instalacji"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Powszechne możliwości"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Różne media dla 32 i 64 bitowych architektur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "Dostaniesz wybór podczas instalacji aby dodać niewolne oprogramowanie."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Nośniki live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Zawierają one niewolne oprogramowanie."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Wszystkie języki są obecne."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Tylko środowisko graficzne GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 #, fuzzy
 msgid "32 or 64 bit architectures."
 msgstr "Różne media dla 32 i 64 bitowych architektur."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Boot-only urządzenia CD"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Klasyczne medium instalacji"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Tylko język angielski."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
@@ -3330,9 +3379,9 @@ msgstr "Pobieranie"
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3343,9 +3392,9 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3355,8 +3404,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Sprawdź przycisk Save File."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3365,197 +3414,213 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Sprawdzanie integralności pobranych mediów"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Otwórz konsolę, root nie wymagany i:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
+"Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
+"bs=1M</userinput>"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Wypal lub zrzuć obraz ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Wypalenie obrazu ISO na CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Zrzuć obraz ISO na pamięci USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Używanie graficznych narzędzi w Magei"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Używanie graficznych narzędzi w Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Powinieneś spróbować:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Użycie linii poleceń w systemie GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Możesz także użyć narzędzia dd w konsoli:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Otwórz konsolę"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Wpisz polecenie <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3579,45 +3644,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
+#: en/SelectAndUseISOs2.xml:317
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Wpisz polecenie: # <userinput>dd if=ścieżka/do/obrazu/ISO.iso of=/dev/sdX "
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Gdzie X=twoje urządzenie nazwane np. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Przykład: # <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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Wpisz polecenie: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Odepnij swoją pamięć USB, skończone"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3642,94 +3716,98 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
+"Jeśli twoja klawiatura nie znajduje się na pokazanej liście, kliknij na "
+"<guibutton>More</guibutton>, aby zobaczyć pełną listę i wybrać z niej swoją "
+"klawiaturę."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Metoda wejścia"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalacja czy uaktualnienie"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Zainstaluj"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Użyj tej opcji dla świeżej instalacji <application>Mageia</application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Uaktualnienie"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Jeśli masz jedną lub więcej instalacji <application>Magei</application> w "
-"swoim komputerze, instalator pozwala na uaktualnienie jednej z nich do "
-"najnowszej wersji."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Tylko uaktualnienie z poprzedniej wersji Magei, która była <emphasis>nadal "
 "wspierana</emphasis>, w momencie ukazania się wersji którą chcesz "
@@ -3738,16 +3816,17 @@ msgstr ""
 "formatowania partycji <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Jeśli podczas instalacji zdecydujesz się ją przerwać, jest taka możliwość, "
 "należy to jednak dobrze przemyśleć. Gdy są już sformatowane partycje lub gdy "
@@ -3759,12 +3838,14 @@ msgstr ""
 "aby zrestartować komputer."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Jeśli zorientujesz się, że zapomniałeś wybrać dodatkowy język, możesz cofnąć "
 "się  z ekranu \"Instalacja/Uaktualnienie do ekranu wyboru języka za pomocą "
@@ -3796,12 +3877,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klawiatura"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3811,16 +3892,17 @@ msgstr ""
 "klawiatury US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3837,40 +3919,41 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Jeśli twoja klawiatura nie znajduje się na pokazanej liście, kliknij na "
 "<guibutton>More</guibutton>, aby zobaczyć pełną listę i wybrać z niej swoją "
 "klawiaturę."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Wybór języka"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3881,7 +3964,7 @@ msgstr ""
 "podczas instalacji jak i w zainstalowanym systemie."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -3892,19 +3975,20 @@ msgstr ""
 "podczas instalacji jak i w zainstalowanym systemie."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Jeśli potrzebujesz mieć kilka języków zainstalowanych w systemie, dla siebie "
 "lub innych użytkowników, możesz użyć przycisku <guibutton>Więcej języków</"
 "guibutton> aby je teraz dodać.  "
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -3918,18 +4002,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Nawet jeśli chcesz zainstalować więcej niż jeden język, musisz najpierw "
 "wybrać jeden z nich jako domyślny w głównym oknie wyboru języka. Będzie on "
 "również zaznaczony jako domyślny w oknie wyboru wielu języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3939,23 +4024,24 @@ msgstr ""
 "klawiatury."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia używa wsparcia UTF-8 (Unicode) domyślnie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Jeśli wiesz, że to kodowanie nie jest odpowiednie dla twojego języka, możesz "
 "wyłączyć wsparcie dla UTF-8 w oknie \"więcej języków\". Będzie to dotyczyć "
 "wszystkich zainstalowanych języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4005,64 +4091,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Dodaj lub zmodyfikuj wpis Boot Menu"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 #, fuzzy
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Graficzne menu Magei są niezłe:"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4076,25 +4162,28 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Nie modyfikuj \"Boot Device\", chyba że masz pojęcie, co robisz."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4108,50 +4197,51 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Używanie bootloader'a Magei"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4165,35 +4255,35 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Użyj istniejącego bootloader'a."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4207,14 +4297,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4223,126 +4313,124 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
+"<guilabel>Hasło (powtórnie)</guilabel>: Wpisz powtórnie hasło użytkownika w "
+"tym polu, instalator sprawdzi czy hasła się zgadzają."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Wykrywanie SCSI"
 
@@ -4355,36 +4443,39 @@ msgstr "Wykrywanie SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "Zazwyczaj DrakX wykrywa twarde dyski poprawnie. Jednak w przypadku "
 "niektórych starszych kontrolerów SCSI może nie być w stanie wykryć "
 "odpowiedniego sterownika i w efekcie nie rozpoznać dysku."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Jeśli zaistnieje taka sytuacja,  zostaniesz poproszony, aby ręcznie wskazać, "
 "który dysk SCSI posiadasz."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i)."
 
@@ -4405,8 +4496,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4422,33 +4512,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Formatowanie twardego dysku"
 
@@ -4459,28 +4551,35 @@ msgstr "Formatowanie twardego dysku"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"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><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Kliknij <guibutton>Wstecz</guibutton> jeśli nie jesteś pewien swojego wyboru."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Kliknij <guibutton>Dalej</guibutton> jeśli jesteś pewien że chcesz wymazać "
 "każdą partycję, każdy system operacyjny oraz wszystkie dane z twardego dysku."
@@ -4592,54 +4691,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Usuwanie Magei"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Co i jak"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4681,6 +4775,239 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Dodatkowo, możesz włączyć lub wyłączyć konto gościa"
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Wszystkie dane, które zapisze w swoim katalogu domowym gość zostaną "
+#~ "wykasowane po jego wylogowaniu. Gość musi zapisywać ważne pliki na USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Aktywuj konto gościa</guilabel>: Tutaj aktywujesz lub "
+#~ "deaktywujesz konto gościa. Konto gościa pozwala na zalogowanie się i "
+#~ "używanie komputera przez gości, ale posiada mniejsze uprawnienia niż "
+#~ "zwykły użytkownik."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Group ID</guilabel>: Pozwala to ustawić ID grupy. Także numer, "
+#~ "zwykle taki sam jak dla użytkownika. Zostaw puste, chyba że wiesz, co "
+#~ "robisz."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Urządzenie\" jest przedstawione jako: \"dysk twardy\", [\"litera dysku"
+#~ "\"], \"numer partycji\" (dla przykładu: \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Stacja robocza"
+
+#~ msgid "Server."
+#~ msgstr "Serwer"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Środowisko graficzne"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Są tutaj cztery grupy, kliknij na trójkąt przed grupą aby rozszerzyć ją i "
+#~ "zobaczyć wszystkie usługi wchodzące w jej skład."
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Jeżeli nie potrafisz znaleźć swojej karty graficznej na liście (ponieważ "
+#~ "jeszcze nie ma jej w bazie danych lub jest starszą kartą) możesz znaleźć "
+#~ "działający sterownik w katalogu Xorg."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Dla każdego wykrytego dysku lub innego urządzenia, jak USB, prezentowana "
+#~ "jest oddzielna karta. Na przykład sda, sdb i sdc jeśli zostały wykryte "
+#~ "trzy urządzenia."
+
+#, 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-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Instalator podzieli obecną przestrzeń odnosząc się do następujących zasad:"
+
+#, fuzzy
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Już na pierwszym ekranie instalatora można ustawić niektóre parametry "
+#~ "instalacji:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Język (tylko dla procesu instalacji, może być inny niż ten, który "
+#~ "wybierzesz dla zainstalowanego systemu) poprzez wciśnięcie klawisza F2"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Dla przykładu zaprezentowany jest ekran powitalny w języku francuskim, "
+#~ "pochądzący z wersji LiveDVD. Zauważ, że menu LiveCD/DVD nie zawiera "
+#~ "pozycji:<guilabel>System ratunkowy</guilabel>, <guilabel>Test pamięci</"
+#~ "guilabel> oraz <guilabel>Program do detekcji sprzętu</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Możesz dodać parametry dla jądra za pomocą klawisza<emphasis role=\"bold"
+#~ "\">F6</emphasis> lub klawisza <emphasis role=\"bold\">e</emphasis> w "
+#~ "trybie UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Jeśli instalacja się nie powiedzie, może zajść potrzeba uruchomienia jej "
+#~ "z jedną z tych dodatkowych opcji. Menu wywoływane klawiszem F6 wyświetli "
+#~ "nam nową linię <guilabel>Opcje uruchamiania</guilabel> oraz zaproponuje "
+#~ "cztery opcje:"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Boot-only urządzenia CD"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Sprawdź przycisk Save File."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Możesz także użyć narzędzia dd w konsoli:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Odepnij swoją pamięć USB, skończone"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Użyj tej opcji dla świeżej instalacji <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."
+#~ msgstr ""
+#~ "Jeśli masz jedną lub więcej instalacji <application>Magei</application> w "
+#~ "swoim komputerze, instalator pozwala na uaktualnienie jednej z nich do "
+#~ "najnowszej wersji."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Co i jak"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4696,13 +5023,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Własne"
 
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
-#~ "wydajności."
-
 #~ msgid "DVD"
 #~ msgstr "DVD"
 
diff --git a/docs/docs/stable/installer/pt_BR.po b/docs/docs/stable/installer/pt_BR.po
index 38823c30..9c716bef 100644
--- a/docs/docs/stable/installer/pt_BR.po
+++ b/docs/docs/stable/installer/pt_BR.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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-30 04:22+0000\n"
 "Last-Translator: Michael Ferreira Martins <michaelfm21@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -34,12 +34,13 @@ msgstr "Licenças e Notas de Lançamento"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -72,8 +73,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Para aceitar, basta selecionar <guilabel>Aceitar</guilabel> e, em seguida, "
@@ -95,9 +97,10 @@ msgstr "Notas de Lançamento"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Informações importantes são fornecidas sobre esta versão do "
@@ -105,13 +108,13 @@ msgstr ""
 "<guibutton>Notas da versão</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "pt_BR"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Seleção de Mídia (Configurar a Instalação de Mídias Suplementares )"
 
@@ -119,23 +122,25 @@ msgstr "Seleção de Mídia (Configurar a Instalação de Mídias Suplementares
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Esta tela lista os repositórios reconhecidos automaticamente. Você pode "
 "adicionar outras fontes de pacotes, como um CD-ROM ou uma fonte remota.  A "
@@ -143,23 +148,25 @@ msgstr ""
 "durante os próximos passos."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Para instalação via rede, siga os seguintes passos:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Escolha e ativação da rede, caso não esteja disponível."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "selecione um mirror ou especifique uma URL (a primeira opção). Selecionando "
 "um mirror, você tem acesso a todos os repositórios gerenciados pela Mageia, "
@@ -168,14 +175,15 @@ msgstr ""
 "NFS de instalação."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Se você estiver atualizando uma instalação de 64 bits que pode conter alguns "
 "pacotes de 32 bits, é aconselhável usar esta tela para adicionar uma midia "
@@ -191,7 +199,7 @@ msgstr "Gerenciador de Usuário e Superusuário"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -204,21 +212,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Definir senha do administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "É aconselhável para todas as instalações <application>Mageia</application> "
 "definir um superusuário e a senha do administrador, normalmente chamado a "
@@ -230,9 +238,10 @@ msgstr ""
 "digitado corretamente a primeira senha, comparando-as."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Todas as senhas são \"case sensitive\" (diferenciam entre letras maiúsculas "
@@ -240,23 +249,25 @@ msgstr ""
 "minúsculas), números e outros caracteres em uma senha."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Digite um usuário"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Adicione um usuário aqui. Um usuário tem menos direitos do que o "
 "superusuário (raiz), mas o suficiente para usar a internet, aplicativos de "
 "escritório ou jogar jogos e tudo o que o usuário médio faz com seu computador"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -265,7 +276,7 @@ msgstr ""
 "ícone do usuário."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -274,10 +285,11 @@ msgstr ""
 "texto."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>nome de Login</guilabel>: Aqui você digita o nome de login do "
@@ -285,40 +297,42 @@ msgstr ""
 "login é \"case sensitive\"."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Senha</guilabel>: Nesta caixa de texto, você deve digitar a senha "
 "do usuário. Há uma blindagem na extremidade da caixa de texto que indica a "
 "força da senha. (Veja também o <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Senha (novamente)</guilabel>: Redigite a senha do usuário na caixa "
-"de texto e Drakx irá verificar se você digitou a mesma senha em cada uma das "
-"caixas de texto de senha do usuário."
+"<guilabel>Senha (novamente)</guilabel>: Digite novamente a senha e Drakx "
+"verificará se ela coincide com a definida acima."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Qualquer usuário que você adicionar ao instalar Mageia, terá um diretório "
 "home protegido tanto de leitura quanto de escrita (umask = 0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -327,90 +341,61 @@ msgstr ""
 "Gerenciamento de usuários </emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "As permissões de acesso também podem ser modificadas depois de instalar."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gerenciamento Avançado de Usuários"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Se teclar em <guibutton>Avançado</guibutton> você é direcionado a uma tela "
 "que permite que você edite as configurações para o usuário que você está "
 "adicionando."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Além disso, você pode desativar ou ativar uma conta de convidado."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Qualquer coisa que um convidado com uma conta de convidado padrão "
-"<emphasis>rbash</emphasis> salva em seu diretório <literal>/home</literal> "
-"será apagada quando ele sair. O usuário convidado deve salvar seus arquivos "
-"importantes em um pendrive USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Ativar conta de convidado</guilabel>: Aqui você pode ativar ou "
-"desativar uma conta de convidado. A conta de convidado permite que um "
-"convidado acessar e usar o PC, mas ele tem acesso mais restrito do que os "
-"usuários normais."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: Esta lista suspensa permite que você altere o "
 "shell usado pelo usuário que você está adicionando na tela anterior, as "
 "opções são Bash, Dash e Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID de usuário</guilabel>: Aqui você pode definir o ID de usuário "
 "para o usuário que você está adicionando na tela anterior. Este é um número. "
 "Deixe em branco se você não sabe o que está fazendo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID de Grupo</guilabel>: Isso permite que você defina o ID do "
-"grupo. Também um número, normalmente o mesmo que para o utilizador. Deixe em "
-"branco se você não sabe o que está fazendo."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Escolha os pontos de montagem"
 
@@ -427,13 +412,14 @@ msgstr "Escolha os pontos de montagem"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -443,7 +429,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -454,41 +440,45 @@ msgstr ""
 "pode alterar os pontos de montagem."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Se você mudar alguma coisa, certifique-se de ainda ter uma partição "
 "<literal>/</literal> (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Cada partição é mostrada como segue: \"Dispositivo\" (\"Capacidade\", "
 "\"Ponto de montagem\", \"Tipo\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Dispositivo\", é composto de: \"disco rígido\", [\"número do disco rígido"
-"\" (letra)], \"número da partição\" (por exemplo, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Se você tiver várias partições, você pode escolher vários pontos de montagem "
 "diferentes a partir de um menu rolante (drop-down), como <literal>/</"
@@ -499,20 +489,22 @@ msgstr ""
 "de uma instalação caldeirão (versão da Mageia em desenvolvimento)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Para partições que você não precisa ter acesso, você pode deixar o campo do "
 "ponto de montagem em branco."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Escolha a opção <guibutton>Anterior</guibutton> se você não tiver certeza do "
 "que escolher, e em seguida, assinale o <guilabel>Personalização do "
@@ -520,7 +512,7 @@ msgstr ""
 "uma partição para ver seu tipo e tamanho."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -791,8 +783,9 @@ msgstr "Seleção de Área de Trabalho"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Dependendo de suas seleções aqui, pode ser oferecido a você telas adicionais "
@@ -800,8 +793,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -820,14 +814,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Escolha se você prefere usar o ambiente de trabalho <application>KDE</"
 "application> ou <application>Gnome</application>. Ambos vêm com um conjunto "
@@ -854,8 +850,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -868,62 +865,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Estação de trabalho."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionamento de partição:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Servidor."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Ambiente Gráfico."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Seleção de Pacotes Individuais: Você pode usar esta opção para adicionar ou "
 "remover pacotes manualmente."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Leia <xref linkend = \"minimal-install\" /> para obter instruções sobre como "
 "fazer uma instalação mínima (sem ou com X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Escolha Pacotes Individuais"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Aqui você pode adicionar ou remover quaisquer pacotes extras para "
 "personalizar a instalação."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -938,47 +942,45 @@ msgstr ""
 "pressionando o mesmo botão durante a instalação e escolhendo a carregá-lo."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configurar os seus serviços"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Aqui você pode definir quais serviços devem (ou não) começar quando você "
 "inicializar seu sistema."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Há quatro grupos, clique no triângulo diante de um grupo para expandi-lo e "
-"ver todos os serviços nele."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "A configuração escolhida pelo DrakX são geralmente boas."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -987,7 +989,7 @@ msgstr ""
 "na caixa de informações abaixo."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Apenas mude as coisas quando você sabe muito bem o que você está fazendo."
@@ -1001,12 +1003,13 @@ msgstr "Configure o seu fuso horário"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1016,18 +1019,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Escolha o seu fuso horário, escolha o seu país ou uma cidade próxima a você "
 "no mesmo fuso horário."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Na próxima tela você pode optar por configurar seu relógio para a hora local "
 "ou GMT, também conhecida como UTC."
@@ -1043,23 +1048,23 @@ msgstr ""
 "GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Escolha um Servidor X (Configure sua Placa de Vídeo)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1068,7 +1073,7 @@ msgstr ""
 "identifica corretamente o seu dispositivo."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1077,101 +1082,98 @@ msgstr ""
 "identificá-la, você pode selecioná-la a partir da árvore, escolhendo:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "fabricante"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "em seguida, o nome de sua placa"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "e o tipo de placa"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Se você não consegue encontrar sua placa nas listas de fabricantes (porque "
-"ainda não está no banco de dados ou é uma placa antiga), você pode encontrar "
-"um driver adequado na categoria Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "A listagem Xorg fornece mais de 40 drivers de placa de vídeos genéricos e de "
 "código aberto. Se você ainda não conseguiu encontrar um driver para o sua "
 "placa, há a opção de usar o driver vesa que fornece os recursos básicos."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Esteja ciente de que se você selecionar um driver incompatível você só pode "
 "ter acesso à interface de linha de comando."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Alguns fabricantes de placas de vídeo oferecem drivers proprietários para "
 "Linux, que só podem estar disponíveis nos repositórios Nonfree e, em alguns "
 "casos, apenas nos sites dos fabricantes de placas."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "O repositório Nonfree tem de ser explicitamente permitido para acessá-los. "
 "Se você não o selecionou anteriormente, você deve fazer isto depois que os "
 "seus primeiros reiniciam."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configuração da placa de vídeo e monitor"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Não importa qual ambiente gráfico (também conhecido como ambiente de "
 "desktop) que você escolheu para esta instalação da <application>Mageia</"
@@ -1185,7 +1187,7 @@ msgstr ""
 "a escolha é incorreta."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1194,13 +1196,14 @@ msgstr ""
 "placa da lista, se necessário.."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Você pode escolher "
 "<guilabel>Plug'n Play</guilabel> quando aplicável, ou escolher o seu monitor "
@@ -1210,30 +1213,31 @@ msgstr ""
 "vertical do seu monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Taxas de atualização incorreta pode danificar o seu monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Resolução</guibutton></emphasis>: Defina aqui a "
 "resolução e profundidade de cor desejada de seu monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Teste</guibutton></emphasis>: O botão de teste nem "
 "sempre aparece durante a instalação. Se o botão está lá, você pode controlar "
@@ -1245,7 +1249,7 @@ msgstr ""
 "segura, caso o botão de teste não esteja disponível</emphasis>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1254,12 +1258,12 @@ msgstr ""
 "ativar ou desativar várias opções."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Escolhendo seu Monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1268,12 +1272,13 @@ msgstr ""
 "identificará corretamente o seu."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Selecionando um monitor com características diferentes pode "
 "danificar seu equipamento de vídeo. Por favor não tente algo sem "
@@ -1281,23 +1286,23 @@ msgstr ""
 "consulte a documentação de seu monitor."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalizado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1310,7 +1315,7 @@ msgstr ""
 "horizontal é a taxa de linhas que serão exibidas."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1323,12 +1328,12 @@ msgstr ""
 "configuração conservadora e consulte a documentação de seu monitor."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1336,12 +1341,12 @@ msgstr ""
 "É a opção padrão e tenta determinar o tipo de monitor no banco de dados."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Fabricante</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1350,28 +1355,30 @@ msgstr ""
 "identificá-lo, você pode selecioná-lo a partir da árvore, escolhendo:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "o nome do fabricante do monitor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "a descrição do monitor"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generic</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "A seleção deste grupo apresenta cerca de 30 configurações de tela, tal como "
 "1024x768 @ 60Hz, incluindo as telas planas como as usadas em laptops. Esta é "
@@ -1381,12 +1388,12 @@ msgstr ""
 "seleções."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Personalização do particionamento de disco com DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1397,12 +1404,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Se você deseja usar a criptografia em sua partição <literal>/</literal> "
 "(raiz) você deve garantir que você tenha uma partição <literal>/boot</"
@@ -1410,43 +1419,44 @@ msgstr ""
 "literal> NÃO deve ser feita, caso contrário, seu sistema não inicializará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Ajuste o layout do seu disco(s) aqui. Você pode remover ou criar partições, "
 "alterar o sistema de arquivos de uma partição ou alterar o seu tamanho e até "
 "mesmo ver o que está neles antes de começar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Há uma aba para cada disco rígido ou outro dispositivo de armazenamento "
-"detectado, como uma chave USB. Por exemplo sda, sdb e sdc, se existem três "
-"deles."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Pressione <guibutton>Limpar tudo</guibutton> para limpar todas as partições "
 "no dispositivo de armazenamento selecionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Para todas as outras ações: clique primeiro na partição desejada. Em "
 "seguida, visualize-o, ou escolha um sistema de arquivos e um ponto de "
@@ -1456,32 +1466,34 @@ msgstr ""
 "um tipo de partição."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continue até que você ajustar tudo como desejar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Click <guibutton>Ok</guibutton> quando estiver pronto."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Se você estiver instalando o Mageia em um sistema UEFI, verifique se um ESP "
 "(EFI System Partition) está presente e montado corretamente em / boot / EFI "
 "(veja abaixo)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1489,12 +1501,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1503,7 +1515,7 @@ msgstr ""
 "uma partição de inicialização do BIOS está presente com um tipo correto"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1516,32 +1528,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Particionamento"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Nesta tela você pode ver o conteúdo do seu(s) disco(s) rígido(s) e ver as "
 "soluções que o assistente de particionamento DrakX encontrou para onde "
 "instalar <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "As opções disponíveis na lista abaixo irão variar, dependendo do layout e do "
 "conteúdo específicos do(s) seu(s) disco(s) rígido(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1554,12 +1568,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Utilizar as partições existentes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1568,12 +1582,12 @@ msgstr ""
 "o Linux foram encontrados e podem ser utilizadas para a instalação."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Usar o espaço livre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1582,12 +1596,12 @@ msgstr ""
 "usá-lo para a sua nova instalação da Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Use o espaço livre na partição do Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1596,7 +1610,7 @@ msgstr ""
 "instalador pode oferecer para usá-lo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1607,7 +1621,7 @@ msgstr ""
 "ter um backup de todos os arquivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1624,12 +1638,14 @@ msgstr ""
 "altamente recomendável fazer backup de seus arquivos pessoais."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Com esta opção, o instalador exibe a partição restante do Windows em azul "
 "claro e a futura partição Mageia em azul escuro com seus tamanhos destinados "
@@ -1637,37 +1653,39 @@ msgstr ""
 "arrastando a lacuna entre as duas partições. Veja a captura de tela abaixo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Apagar e utilizar o Disco Inteiro."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Esta opção utilizará a unidade completa para a Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Atenção! Esta operação apagará todos os dados do disco rígido selecionado. "
 "Tenha cuidado!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1678,12 +1696,12 @@ msgstr ""
 "opção."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Personalizar Particionamento"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1692,69 +1710,82 @@ msgstr ""
 "rígido(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionamento de partição:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"O instalador irá compartilhar o local disponível de acordo com as seguintes "
-"regras:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Se o local total disponível é menor do que 50 GB, apenas uma partição é "
 "criada para /, não haverá nenhuma partição separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Se o local total disponível é de mais de 50GB, então três partições são "
 "criadas"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "6/19 do espaço total disponível é atribuída a / com um máximo de 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 é alocado para área de troca com um máximo de 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "o restante (pelo menos 12/19) é atribuído ao /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Isso significa que a partir de 160 GB ou mais de espaço disponível, o "
 "instalador irá criar três partições: 50 GB para /, 4 GB de swap e o resto "
 "para /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Se você estiver usando um sistema UEFI, o ESP (EFI partição do sistema) será "
 "detectada automaticamente, ou criada se ela não existir ainda, e montada em /"
@@ -1762,13 +1793,14 @@ msgstr ""
 "feita corretamente"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Se você estiver usando um sistema Legacy (como conhecido como CSM ou BIOS) "
 "com um disco GPT, você precisará criar uma partição de inicialização do Bios "
@@ -1779,7 +1811,7 @@ msgstr ""
 "sistema de arquivos."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1790,7 +1822,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1799,15 +1831,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Alguns discos mais recentes, estão usando setores lógicos de 4096 bytes, ao "
 "invés do padrão anterior de 512 bytes. Em razão da indisponibilidade de "
@@ -1818,19 +1851,22 @@ msgstr ""
 "alternativo, tipo o gparted, e use a seguinte configuração:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Arredondar para\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Espaço livre Antes (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Certifique-se também que todas as partições tenham sido criadas com um "
 "número par de megabytes."
@@ -1841,7 +1877,7 @@ msgid "Installation from LIVE medium"
 msgstr "Instalação do LIVE CD"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1856,18 +1892,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "A documentação oficial para Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1879,7 +1915,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1891,7 +1927,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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1903,13 +1939,13 @@ msgstr ""
 "Documentação</link>, se você deseja ajudar a melhorar este manual."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1921,26 +1957,34 @@ msgstr ""
 "durante a instalação."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalando com DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Fevereiro 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1948,7 +1992,7 @@ msgstr "Parabéns"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1957,7 +2001,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1967,17 +2011,18 @@ msgstr ""
 "agora é seguro remover a mídia de instalação e reiniciar o seu computador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Depois de reiniciar, você poderá escolher, na tela do gerenciador de "
 "inicialização, entre os sistemas operacionais instalados no seu computador "
 "(se você tiver mais de um)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1986,12 +2031,12 @@ msgstr ""
 "instalação Mageia será automaticamente selecionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Divirta-se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2006,11 +2051,12 @@ msgstr "Firewall"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Esta seção permite configurar algumas regras de firewall simples: eles "
 "determinam qual tipo de mensagem da Internet será aceita pelo sistema alvo. "
@@ -2019,15 +2065,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Na configuração padrão, nenhum botão está marcado - nenhum serviço do "
 "sistema é acessível da rede. O botão \"<emphasis>Tudo (sem firewall)</"
@@ -2040,10 +2087,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Todos os outros botões de verificação são mais ou menos auto-explicativos. "
 "Por exemplo, você verificará o botão \"servidor CUPS\" se desejar que as "
@@ -2056,12 +2104,11 @@ msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "O conjunto de botões de verificação apenas compreende os serviços mais "
 "comuns. O botão \"Avançado\" permite habilitar mensagens que correspondem a "
@@ -2070,12 +2117,12 @@ msgstr ""
 "uma série de serviços digitando uma lista de casais (em branco)"
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 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:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2086,7 +2133,7 @@ msgstr ""
 "conforme definido no <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2095,7 +2142,7 @@ msgstr ""
 "<emphasis>UDP</emphasis> - o protocolo de internet que é usado pelo serviço."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2104,7 +2151,7 @@ msgstr ""
 "de <emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2113,7 +2160,7 @@ msgstr ""
 "especifica 2 casais para a mesma porta."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatação"
 
@@ -2122,14 +2169,14 @@ msgstr "Formatação"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2139,24 +2186,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Aqui você pode escolher qual(s) partição(s) que deseja formatar. Quaisquer "
 "dados nas partições marcadas para formatação <emphasis>não</emphasis> serão "
 "salvos."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Normalmente, pelo menos as partições DrakX selecionados precisam ser "
 "formatadas."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2165,12 +2213,13 @@ msgstr ""
 "você deseja verificar os chamados <emphasis>bad blocks</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Se você não tem certeza de ter feito a escolha certa, você pode clicar em "
 "<guibutton>Anterior</guibutton>, novamente em <guibutton>Anterior</"
@@ -2179,7 +2228,7 @@ msgstr ""
 "partições."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2188,12 +2237,12 @@ msgstr ""
 "<guibutton>Próximo</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, o Instalador da Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2204,7 +2253,7 @@ msgstr ""
 "possível."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2213,36 +2262,40 @@ msgstr ""
 "instalador, que será, normalmente, tudo o que você irá precisar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Primeira Tela da Instalação"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Usando um DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Aqui estão as telas de boas-vindas padrão ao usar um DVD Mageia, o primeiro "
 "com um sistema legado e a segunda com um sistema UEFI:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Nesta tela, você pode acessar as opções pressionando a letra \"e\" para "
 "entrar no \"modo de edição\". Para voltar a esta tela, pressione a tecla "
@@ -2250,116 +2303,109 @@ msgstr ""
 "sair com a gravação."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Desta tela, é possível definir algumas preferências pessoais:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"A língua (para a instalação só, pode ser diferente, que a língua escolhida "
-"para o sistema), pressionar a tecla F2 (para modo herdado único)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Use as setas para selecionar o idioma e pressione a tecla Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Aqui está, por exemplo, a tela de boas-vindas francês ao usar um DVD Live/"
-"CD. Note que o menu do Live DVD / CD não propõe: <guilabel>Resgate de "
-"Sistema</guilabel>, <guilabel>teste de memória</guilabel> e <guilabel> "
-"ferramenta de detecção de Hardware</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Use as setas para selecionar o idioma e pressione a tecla Enter."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
+#, fuzzy
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Alterar a resolução da tela, pressionando a tecla F3 (modo herdado apenas)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Adicione algumas opções de kernel, pressionando o <emphasis role=\"bold"
-"\">F6</emphasis> chave para o modo de legado <emphasis role = \"bold\">ou</"
-"emphasis> a chave para o modo de UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Padrão, ele não altera nada nas opções padrão."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Se a instalação falhar, então pode ser necessário tentar de novo utilizando "
-"uma das opções adicionais. O menu chamado por F6 exibe uma nova linha "
-"chamada <guilabel>opções de inicialização</guilabel> e propor quatro "
-"entradas:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Padrão, ele não altera nada nas opções padrão."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), gerenciamento de "
 "energia não é levado em conta."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- No APIC local (Local avançada Controlador de interrupção programável), "
 "trata-se de interrupções de CPU, selecione essa opção se você pediu."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2368,55 +2414,52 @@ msgstr ""
 "exibido nas <guilabel>opções de inicialização</guilabel> linha."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Em alguns lançamentos Mageia, pode acontecer que as entradas selecionadas "
 "com a tecla F6 não aparecer nas  <guilabel>opções de inicialização</"
 "guilabel> linha, no entanto, eles são realmente levados em conta."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Adicionar mais opções de kernel, pressionando a tecla F1 (apenas modo "
-"Legado)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Pressionando F1 abre uma nova janela com opções mais disponíveis. Escolha um "
 "com as teclas de seta e pressione Enter para ter mais detalhes ou pressione "
 "a tecla Esc para voltar para a tela de boas-vindas."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "A visão detalhada sobre a opção inicial. Pressione Esc ou selecione  "
 "<guilabel>Voltar as opções de inicialização</guilabel> para voltar à lista "
@@ -2424,19 +2467,22 @@ msgstr ""
 "inicialização</guilabel> linha."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "A ajuda é traduzida no idioma escolhido com a tecla F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2447,81 +2493,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Usando uma Rede Cabeada"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Aqui está a tela padrão de boas-vindas quando se usa o CD de Instalação "
-"baseado em Rede Cabeada (imagens netinstall.iso ou netinstall-nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Ele não permite a alteração da língua, as opções disponíveis estão descritos "
-"na tela. Para mais informações sobre o uso de um CD de instalação baseada em "
-"rede com fio, consulte <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\"> o Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "O layout do teclado é o americano."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "As etapas de instalação"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "O processo de instalação é dividido em um número de passos, o que pode ser "
 "seguido no painel lateral da tela."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Cada passo tem uma ou mais telas que também podem ter botões "
 "<guibutton>Avançados</guibutton> com opções extras, menos comumente "
 "necessárias."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "A maioria das telas tem botões de <guibutton>Ajuda</guibutton> que contém "
 "explicações sobre a etapa atual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2540,17 +2553,17 @@ msgstr ""
 "Delete</guibutton> simultaneamente, para reiniciar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas de Instalação e Possíveis Soluções"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Sem Interface Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2562,13 +2575,16 @@ msgstr ""
 "texto)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Se o hardware é muito antigo, uma instalação gráfica pode não ser possível. "
 "Neste caso, vale a pena tentar uma instalação em modo texto. Para utilizar "
@@ -2577,12 +2593,12 @@ msgstr ""
 "\" e pressione ENTER. Agora continue com a instalação em modo texto."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "A Instalação Congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2597,14 +2613,15 @@ msgstr ""
 "combinada com outras opções, conforme necessário."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "problema RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2616,18 +2633,20 @@ msgstr ""
 "especificar 256MB de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "partições dinâmicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Se você converteu seu disco rígido a partir de formato \"básico\" para "
 "formato \"dinâmico\" no Microsoft Windows, você deve saber que é impossível "
@@ -2646,18 +2665,18 @@ msgstr "Atualizações"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2666,10 +2685,11 @@ msgstr ""
 "alguns pacotes foram atualizados ou melhorados."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Escolha <guilabel>sim</guilabel> se você deseja fazer o download e instalá-"
@@ -2677,8 +2697,9 @@ msgstr ""
 "ou se você não estiver conectado à Internet."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Em seguida, pressione <guibutton>Próximo</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
@@ -2735,18 +2756,18 @@ msgstr "Seleção de Mídia (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2759,7 +2780,7 @@ msgstr ""
 "pacotes estarão disponíveis para seleção durante os próximos passos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2768,7 +2789,7 @@ msgstr ""
 "que ele contém a base da distribuição."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2783,13 +2804,14 @@ msgstr ""
 "de vários cartões WiFi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "O repositório <emphasis>Tainted</emphasis> inclui pacotes distribuídos sob "
 "licença livre. O principal critério para colocar pacotes neste repositório é "
@@ -2799,38 +2821,41 @@ msgstr ""
 "comercial, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalação Mínima"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Você pode escolher uma instalação mínima desmarcando todas as seleções na "
 "tela Seleção do Grupo de Pacotes, ver <xref linkend=\"choosePackageGroups"
 "\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Se desejar, você também poderá marcar a opção \"seleção de pacotes "
 "individuais\" na mesma tela."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Instalação mínima é destinada para aqueles com usos específicos em mente "
 "para o seu <application>Mageia</application>, como um servidor ou uma "
@@ -2840,9 +2865,10 @@ msgstr ""
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Se você escolher esta classe de instalação, em seguida, a próxima tela irá "
@@ -2850,16 +2876,14 @@ msgstr ""
 "documentação e o X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Se selecionado, \"Com X\" também incluirá IceWM como ambiente de trabalho "
-"leve."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2874,15 +2898,15 @@ msgstr ""
 "páginas info."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2899,11 +2923,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX fez escolhas inteligentes para a configuração do seu sistema, "
 "dependendo das escolhas que você fez e sobre o hardware detectado pelo "
@@ -2912,9 +2937,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Como regra geral, as configurações padrão são recomendadas e você pode mantê-"
 "las com 3 exceções:"
@@ -2931,73 +2957,77 @@ msgstr "a configuração padrão já foi testada e falha"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "algo mais é informado nas seções detalhadas abaixo"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parâmetros do Sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuso horário</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX seleciona um fuso horário para você, dependendo de seu idioma "
 "preferido. Você pode mudá-lo se necessário. ver também <xref linkend="
 "\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Região</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Se você não está no país selecionado, é muito importante que você corrija a "
 "configuração. Ver <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Gerenciador de Inicialização</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "DrakX fez boas opções para a configuração do gerenciador de inicialização."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Não altere nada, a menos que saiba como configurar o Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Para mais informações, consulte <xref linkend=\"setupBootloader\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gerenciamento de usuário</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3006,22 +3036,23 @@ msgstr ""
 "próprios diretórios na pasta <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Serviços</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Serviços do sistema referem-se aos pequenos programas que rodam no "
 "background (daemons). Esta ferramenta permite habilitar ou desabilitar "
 "certas tarefas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3030,31 +3061,32 @@ msgstr ""
 "erro pode impedir o seu computador de funcionar corretamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Para mais informações, consulte <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parâmetro de Hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclado</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Isto é onde você configura ou altera o layout do teclado, que vai depender "
 "do seu Idioma, localização ou tipo de teclado."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3063,12 +3095,12 @@ msgstr ""
 "que suas senhas também vão mudar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3077,40 +3109,41 @@ msgstr ""
 "tablets, trackballs, etc"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Placa de Som</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "O instalador usa o driver padrão, se há um padrão. A opção para selecionar "
 "um driver diferente só é dado quando há mais de um driver para a sua placa, "
 "mas nenhum deles é o padrão."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interface Gráfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Esta secção permite-lhe configurar sua placa(s) de vídeo(s) e monitores."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Para mais informação, consulte <xref linkend=\"configureX_chooser\"></xref>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3119,20 +3152,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parâmetros de rede e internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rede</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3142,21 +3176,22 @@ msgstr ""
 "repositórios de mídia Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Quando você adiciona uma placa de rede, não se esqueça de configurar o seu "
 "firewall para ver aquela interface também."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3167,26 +3202,27 @@ msgstr ""
 "serviço proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Você pode precisar consultar o seu administrador de sistemas para obter os "
 "parâmetros que você precisa inserir aqui."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Segurança"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nível de Segurança</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3195,17 +3231,17 @@ msgstr ""
 "casos, a configuração padrão (Standard) é adequada para uso geral."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Verifique a opção que melhor se adapta ao seu uso."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3214,7 +3250,7 @@ msgstr ""
 "patifes lá fora, na internet, que possam comprometer ou roubar eles."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3225,7 +3261,7 @@ msgstr ""
 "consulte <xref linkend = \"firewall\" />."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Ter em mente que permitir tudo (sem firewall) pode ser muito arriscado."
@@ -3294,40 +3330,73 @@ msgstr ""
 "espaço para a instalação do <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionamento de partição:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Você pode ajustar o seu nível de segurança aqui."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Avançado</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"Deixe as configurações padrão como estão, se você não sabe o que escolher."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Após a instalação, sempre será possível ajustar as configurações de "
 "segurança na aba <guilabel>Segurança</guilabel> do Centro de Controle Mageia."
@@ -3344,25 +3413,27 @@ msgstr "Introdução"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia é distribuído através de imagens ISO. Esta página irá ajudá-lo a "
 "escolher qual imagem corresponde às suas necessidades."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Há duas famílias de mídia:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "instalador clássico: Depois de iniciar a mídia, ele irá seguir um processo "
 "que permite escolher o que instalar e como configurar o seu sistema de "
@@ -3371,83 +3442,87 @@ msgstr ""
 "instalar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Mídia Live: você pode inicializar a mídia em um sistema Mageia real sem "
-"instalá-lo, para ver o que você terá após a instalação. O processo de "
-"instalação é semelhante, mas você fará menos escolhas."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Detalhes são fornecidos nas próximas seções."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Mídia"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definição"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Aqui, um meio (plural: mídia) é um arquivo de imagem ISO que permite que "
 "você instale e / ou atualizar Mageia e, por extensão, qualquer suporte "
 "físico do arquivo ISO é copiado para."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Você pode encontrá-los <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">aqui</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Classical installation media"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "características comuns"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Estas ISOs usar o instalador tradicional chamado DrakX."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Eles são capazes de fazer uma instalação limpa ou uma atualização de versões "
 "anteriores."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Meios diferentes para arquiteturas 32 ou 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3456,12 +3531,12 @@ msgstr ""
 "Sistema, teste de memória, hardware ferramenta de detecção."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Cada DVD contém muitos ambientes de trabalho disponíveis e idiomas."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3469,101 +3544,106 @@ msgstr ""
 "free."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Mídia Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Pode ser usado para visualizar a distribuição sem instalar em um disco "
 "rígido, e, opcionalmente, instalar Mageia no seu Disco Rígido."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "Cada ISO contém apenas um ambiente de trabalho (Plasma, GNOME ou Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">ISOs Live só pode ser usado para criar instalações "
 "limpas, eles não podem ser usados para atualizar a partir de versões "
 "anteriores.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Contêm software não livre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Ambiente de trabalho de plasma apenas."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Todas as línguas estão presentes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Arquitetura de 64 bits somente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Ambiente Desktop GNOME somente."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Arquitetura de 64 bits somente"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Xfce apenas ambiente de trabalho."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "Arquitetura de 32 ou 64 bit"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Mídia de CD somente de Inicialização"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3575,28 +3655,30 @@ msgstr ""
 "local, em uma rede local ou na Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Estes meios são muito leves (menos de 100 MB) e são convenientes quando a "
 "largura de banda é muito baixo para baixar um DVD completo, um PC sem um "
 "drive de DVD ou um PC que não pode arrancar a partir de um stick USB."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Somente linguagem Inglês. "
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3630,11 +3712,12 @@ msgstr "Baixando"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Depois de ter escolhido o sua ISO, você pode baixá-lo usando http ou "
 "BitTorrent. Em ambos os casos, uma janela fornece algumas informações, como "
@@ -3648,10 +3731,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "Md5sum e sha1sum são ferramentas para verificar a integridade ISO. Use "
 "apenas um deles. Mantenha um deles <link linkend=\"integrity\">para uso "
@@ -3664,8 +3748,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Verifique a de opção Salvar arquivo."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3673,14 +3757,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Verificar a integridade da mídia baixada"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Ambas as somas de verificação são números hexadecimais calculados por um "
 "algoritmo do arquivo a ser baixado. Quando você pede a esses algoritmos para "
@@ -3690,69 +3775,84 @@ msgstr ""
 "um reparo usando o BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Abra um console, não há necessidade de ser root, e:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Para usar o md5sum, digite: [sam@localhost] $ <userinput>md5sum caminho/"
 "para/o/image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Para usar sha1sum, digite: [padula@localhost]$ <userinput>sha1sum caminho/"
 "para/o/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"e comparar o número obtido em seu computador (você pode ter que esperar por "
-"um tempo) com o número dado pelo Mageia. exemplo:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"e comparar o número obtido em seu computador (você pode ter que esperar por "
+"um tempo) com o número dado pelo Mageia. exemplo:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Queimar ou despejar a ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "A ISO verificado agora pode ser gravado em um CD ou DVD ou jogados para um "
 "stick USB. Estas operações não são uma cópia simples e visam tornar um meio "
 "de inicialização-poder."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Gravando a ISO para o CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Use o queimador que você desejar, mas assegure que o dispositivo de gravação "
 "está configurado corretamente para <emphasis role=\"bold\">Gravar Imagem</"
@@ -3761,12 +3861,12 @@ msgstr ""
 "da Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Despejar a ISO para um pendrive USB "
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3775,18 +3875,19 @@ msgstr ""
 "los para um stick USB e usá-lo para inicializar e instalar o sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "o \"Dumping\" uma imagem em um dispositivo flash destrói qualquer sistema de "
 "arquivo anterior no dispositivo; quaisquer outros dados serão perdidos e a "
 "capacidade de separação irá ser reduzida ao tamanho da imagem."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3795,12 +3896,12 @@ msgstr ""
 "reformatar o dispositivo USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Usando uma ferramenta gráfica do Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3809,74 +3910,73 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Usando uma ferramenta gráfica do Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Você poderia tentar:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> usando "
 "a opção \"ISO image\" ;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Imagem "
 "do Disco Win32</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Usando linha de comando dentro de um sistema GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "É potencialmente *perigoso* fazer isso manualmente. Você corre o risco de "
 "sobrepor uma partição do disco se você iniciar o dispositivo de "
 "identificação errado."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Você também pode usar a ferramenta dd em um console:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Abra um console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Torne-se root com o comando <userinput>su -</userinput> (não se esqueça a "
 "final '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3885,28 +3985,40 @@ msgstr ""
 "qualquer aplicativo ou gerenciador de arquivos que podem acessar ou lê-lo)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Digite o comando <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
+msgid ""
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Encontre o nome do dispositivo para o seu pen drive USB (pelo seu tamanho), "
+"por exemplo <code>/dev/sdb</code> na imagem acima, é um pen drive USB 8GB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Alternativamente, você pode obter o nome do dispositivo com o comando "
 "<code>dmesg</code>: no final, você vê o nome do dispositivo que começa com "
 "<emphasis>sd</emphasis>, e <emphasis>sdd</emphasis> neste caso:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3948,46 +4060,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Encontre o nome do dispositivo para o seu pen drive USB (pelo seu tamanho), "
-"por exemplo <code>/dev/sdb</code> na imagem acima, é um pen drive USB 8GB."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Entre cm o 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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Onde X=o nome do dispositivo, por exemplo: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Exemplo: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Digite o comando: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Desligue o seu dispositivo USB, e pronto"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4017,19 +4138,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Se o seu país não está na lista, clique no botão <guilabel>Outros Países</"
 "guilabel> e escolha seu país / região lá."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Se o seu país está apenas na lista <guilabel>Outros Países</guilabel>, "
@@ -4038,18 +4161,19 @@ msgstr ""
 "escolha real."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Método de entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Na tela <guilabel>Outros países</guilabel>, você também pode selecionar um "
@@ -4061,11 +4185,13 @@ msgstr ""
 "mídia HTTP / FTP antes da seleção do pacote."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Se você perdeu a configuração do método de entrada durante a instalação, "
 "você pode acessá-la depois de inicializar o sistema instalado através de "
@@ -4073,56 +4199,54 @@ msgstr ""
 "como root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalar ou atualizar"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
+"> </imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalar"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Utilize esta opção para uma nova instalação <application>Mageia</"
-"application>.  ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Atualizar"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Se você tiver um ou mais <application>Mageia</application> instalações em "
-"seu sistema, o instalador irá permitir que você atualize um deles para a "
-"versão mais recente."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Só atualizando a partir de uma versão anterior que Mageia<emphasis>ainda "
 "suportado</emphasis> quando a versão deste instalador foi lançado, foi "
@@ -4132,16 +4256,17 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Se durante a instalação você decidir interromper a instalação, é possível "
 "reiniciar, mas por favor, pense duas vezes antes de fazer isso. Uma vez que "
@@ -4154,12 +4279,14 @@ msgstr ""
 "reiniciar."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Se você descobriu que você esqueceu de selecionar um idioma adicional, você "
 "pode retornar a partir da tela \"Instalar ou Atualizar\" para a tela de "
@@ -4194,12 +4321,12 @@ msgstr ""
 "horário selecionados anteriormente."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Teclado"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4208,16 +4335,17 @@ msgstr ""
 "adequado for encontrado, ele será o padrão para um layout de teclado dos EUA."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\" "
-"> </imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4234,22 +4362,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Se o seu teclado não está na lista exibida, clique em <guibutton>Mais</"
 "guibutton> para obter uma lista completa, e selecionar o seu teclado lá."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Depois de escolher um teclado a partir do diálogo <guibutton>Mais</"
 "guibutton>, você vai voltar para a primeira caixa de diálogo de escolha do "
@@ -4258,23 +4388,24 @@ msgstr ""
 "escolheu da lista completa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Se você escolher um teclado baseado em caracteres não latinos, você verá uma "
 "tela de diálogo extra perguntando como você prefere alternar entre os "
 "layouts de teclados latinos e não latinos."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Por favor, escolha um idioma para usar"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4285,7 +4416,7 @@ msgstr ""
 "seleção durante a instalação e para o sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4295,12 +4426,13 @@ msgstr ""
 "seleção durante a instalação e para o sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Se é provável que você vai exigir vários idiomas instalado em seu sistema, "
 "para si ou para outros usuários, então você deve usar o botão "
@@ -4308,7 +4440,7 @@ msgstr ""
 "difícil adicionar o suporte a idiomas adicionais após a instalação."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4321,18 +4453,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Mesmo se você escolher mais de um idioma, você deve primeiro escolher um "
 "deles como seu idioma preferido na primeira tela de idiomas. Também será "
 "marcado como escolhido na tela de múltiplos idiomas."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4341,23 +4474,24 @@ msgstr ""
 "aconselhável instalar o idioma do teclado também."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia usa o suporte UTF-8 (Unicode) por padrão."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Isso pode ser desativado na tela \"vários idiomas\" se você sabe que não é "
 "apropriado para seu idioma. Exibindo UTF-8 aplica-se a todos os idiomas "
 "instalados."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4413,69 +4547,74 @@ msgstr ""
 "botões."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Adicionando ou Modificando uma Entrada do Menu de Inicialização"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Para fazer isso, você precisa editar manualmente /boot/grub2/custom.cfg ou "
 "usar o software grub-customizer (disponível nos repositórios Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Para mais informações, consulte o nosso wiki: <link ns2:href=\"https://wiki."
 "mageia.org/pt/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia </link >"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Interface do Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Por padrão, o Mageia usa exclusivamente:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (com ou sem menu gráfico) para um sistema Legacy / MBR ou Legacy / GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi para um sistema UEFI."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "O menu gráfico da Mageia é ótimo :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 em sistemas Legacy / MBR e Legacy / GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4488,28 +4627,33 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Não modifica o \"Boot Device\", a menos que realmente saber o que fazer."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi nos sistemas UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Com um sistema UEFI, a interface do usuário é ligeiramente diferente, pois "
 "você não pode escolher entre com ou sem menu gráfico"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4522,14 +4666,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Se o Mageia é o único sistema instalado no seu computador, o instalador "
@@ -4541,36 +4686,41 @@ msgstr ""
 "sistemas operacionais que você tem."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Usando o Gerenciador de Inicialização da Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Por padrão, de acordo com seu sistema, Mageia escreve um novo:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "GRUB2 no MBR (Master Boot Record) do seu primeiro disco rígido ou na "
 "partição de boot do BIOS."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "Grub2-efi bootloader para o ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Se você já tiver outros sistemas operacionais instalados, o Mageia tentará "
 "adicioná-los ao seu novo menu de inicialização do Mageia. Se você não quiser "
@@ -4578,7 +4728,7 @@ msgstr ""
 "caixa <guilabel>Probe Foreign OS</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4591,18 +4741,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Usando um Gerenciador de Inicialização existente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "O procedimento exato para adicionar o seu sistema Mageia ao Gerenciador de "
 "Inicialização existente, está além do escopo desta ajuda, no entanto, na "
@@ -4612,16 +4763,17 @@ msgstr ""
 "questão."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Usando o carregamento de corrente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Se você não quiser um Mageia inicializável, mas carregá-lo de outro sistema "
 "operacional, clique em <guibutton>Avançar</guibutton>, em "
@@ -4629,7 +4781,7 @@ msgstr ""
 "MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4642,7 +4794,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4653,7 +4805,7 @@ msgstr ""
 "inicialização."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4662,33 +4814,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Primeira pagina"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Atraso antes de inicializar a imagem padrão</guilabel>: Esta caixa "
 "de texto permite definir um atraso em segundos antes que o sistema "
 "operacional padrão seja iniciado."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Segurança</guilabel>: isso permite que você defina uma senha para "
 "o gerenciador de inicialização. Isso significa que um usuário e uma senha "
@@ -4697,37 +4850,37 @@ msgstr ""
 "senha é escolhida aqui depois."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Senha</guilabel>: Esta caixa de texto é onde você realmente coloca "
 "a senha"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Senha (novamente)</guilabel>: Digite novamente a senha e Drakx "
 "verificará se ela coincide com a definida acima."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Avançado</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Habilitar ACPI:</guilabel> A ACPI (Advanced Configuration and "
 "Power Interface) é um padrão para o gerenciamento de energia. Ele pode "
@@ -4738,21 +4891,22 @@ msgstr ""
 "sistema)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Ativar SMP</guilabel>: esta opção ativa / desativa o "
 "multiprocessamento simétrico para processadores multi-núcleo."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Ativar APIC</guilabel>: Ativar ou desativar o acesso do sistema "
 "operacional ao Controlador Avançado de Interrupção Programável. Os "
@@ -4760,27 +4914,28 @@ msgstr ""
 "gerenciamento de IRQ (Interrupt Request) avançado."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Ativar Local APIC</guilabel>: Aqui você pode definir APIC local, "
 "que gerencia todas as interrupções externas para um processador específico "
 "em um sistema SMP."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Próxima Pagina"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr "<guilabel>Padrão:</guilabel> Sistema operacional iniciado por padrão"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4790,7 +4945,7 @@ msgstr ""
 "medida que inicia."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4799,11 +4954,12 @@ msgstr ""
 "\"setupMageiaBootloader\"> Usando um gerenciador de boot Mageia </link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel> Modo de vídeo:</guilabel> Define o tamanho da tela ea "
 "profundidade de cor que o menu de inicialização usará. Se você clicar no "
@@ -4811,7 +4967,7 @@ msgstr ""
 "de cor."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4821,7 +4977,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Detecção de disco rígido"
 
@@ -4834,36 +4990,39 @@ msgstr "Detecção de disco rígido"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "O DrakX normalmente detecta discos rígidos corretamente. Pode, contudo, não "
 "detectar alguns controladores de disco SCSI antigos e, portanto, deixar de "
 "instalar os drivers necessários."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Se isso acontecer, você terá que manualmente dizer ao Drakx qual o "
 "dispositivo(s) SCSI que você tem."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "O DrakX deve então ser capaz de configurar o dispositivo(s) corretamente."
@@ -4885,10 +5044,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Nesta tela o nome do driver que instalador escolheu para sua placa de som "
 "foi dado, que será o driver padrão, se temos um padrão."
@@ -4911,10 +5070,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Em seguida, no draksound ou \"Configuração de Som\", ferramentas, clique em "
 "<guibutton>Avançado</guibutton> e, em seguida, em <guibutton>Solução de "
@@ -4922,32 +5083,35 @@ msgstr ""
 "resolver o problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avançado"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Clicando <guibutton>Avançado</guibutton> nesta tela, durante a instalação, é "
 "útil se não houver nenhum driver padrão também existem vários drivers "
 "disponíveis, quando achar que o instalador escolheu errado."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Nesse caso, você pode selecionar um driver diferente após clicar no "
 "<guibutton>Deixe-me escolher qualquer driver</guibutton>"
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirme o disco rígido para ser formatado"
 
@@ -4958,13 +5122,13 @@ msgstr "Confirme o disco rígido para ser formatado"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4974,18 +5138,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Clique em <guibutton>Anterior</guibutton> se você não tem certeza sobre sua "
 "escolha."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Clique em <guibutton>Avançar</guibutton> se você tem certeza e deseja apagar "
 "todas as partições, cada sistema operacional e todos os dados no disco "
@@ -5110,16 +5277,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Desinstalando o Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Como"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Se Mageia não convencê-lo ou você não pode instalá-lo corretamente, em suma, "
@@ -5127,28 +5290,30 @@ msgstr ""
 "possibilidade de desinstalar. Isso não é verdade para cada sistema "
 "operacional."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Após o backup de dados, reinicie sua instalação Mageia DVD e selecione "
 "sistema de Resgate, então, a restauração do gerenciador de inicialização. Na "
 "próxima inicialização, você só vai ter o Windows sem opção de escolher o seu "
 "sistema operacional."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Para recuperar o espaço usado por divisórias Mageia no Windows, clique em "
 "<code>Iniciar -> Painel de Controle -> Ferramentas Administrativas -> "
@@ -5158,8 +5323,8 @@ msgstr ""
 "seu tamanho e lugar no disco. Botão direito do mouse sobre cada uma dessas "
 "partições e selecione <guibutton>Excluir</guibutton>. O espaço será liberado."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5167,14 +5332,15 @@ msgstr ""
 "Se você estiver usando o Windows XP, você pode criar uma nova partição e "
 "formatá-lo (FAT32 ou NTFS). Ele vai receber uma carta de partição."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Se você tiver Vista ou 7, você tem mais uma possibilidade, você pode "
 "estender a partição existente que está à esquerda do espaço libertado. Há "
@@ -5228,3 +5394,337 @@ msgstr ""
 "O próximo passo é a cópia de arquivos no disco rígido. Isso leva alguns "
 "minutos. No final, você recebe uma tela em branco por algum tempo, isso é "
 "normal."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Senha (novamente)</guilabel>: Redigite a senha do usuário na "
+#~ "caixa de texto e Drakx irá verificar se você digitou a mesma senha em "
+#~ "cada uma das caixas de texto de senha do usuário."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Além disso, você pode desativar ou ativar uma conta de convidado."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Qualquer coisa que um convidado com uma conta de convidado padrão "
+#~ "<emphasis>rbash</emphasis> salva em seu diretório <literal>/home</"
+#~ "literal> será apagada quando ele sair. O usuário convidado deve salvar "
+#~ "seus arquivos importantes em um pendrive USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Ativar conta de convidado</guilabel>: Aqui você pode ativar ou "
+#~ "desativar uma conta de convidado. A conta de convidado permite que um "
+#~ "convidado acessar e usar o PC, mas ele tem acesso mais restrito do que os "
+#~ "usuários normais."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID de Grupo</guilabel>: Isso permite que você defina o ID do "
+#~ "grupo. Também um número, normalmente o mesmo que para o utilizador. Deixe "
+#~ "em branco se você não sabe o que está fazendo."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Dispositivo\", é composto de: \"disco rígido\", [\"número do disco "
+#~ "rígido\" (letra)], \"número da partição\" (por exemplo, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Estação de trabalho."
+
+#~ msgid "Server."
+#~ msgstr "Servidor."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Ambiente Gráfico."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Há quatro grupos, clique no triângulo diante de um grupo para expandi-lo "
+#~ "e ver todos os serviços nele."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Se você não consegue encontrar sua placa nas listas de fabricantes "
+#~ "(porque ainda não está no banco de dados ou é uma placa antiga), você "
+#~ "pode encontrar um driver adequado na categoria Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Há uma aba para cada disco rígido ou outro dispositivo de armazenamento "
+#~ "detectado, como uma chave USB. Por exemplo sda, sdb e sdc, se existem "
+#~ "três deles."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "O instalador irá compartilhar o local disponível de acordo com as "
+#~ "seguintes regras:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Arredondar para\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Espaço livre Antes (MiB)\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Desta tela, é possível definir algumas preferências pessoais:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "A língua (para a instalação só, pode ser diferente, que a língua "
+#~ "escolhida para o sistema), pressionar a tecla F2 (para modo herdado único)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Aqui está, por exemplo, a tela de boas-vindas francês ao usar um DVD Live/"
+#~ "CD. Note que o menu do Live DVD / CD não propõe: <guilabel>Resgate de "
+#~ "Sistema</guilabel>, <guilabel>teste de memória</guilabel> e <guilabel> "
+#~ "ferramenta de detecção de Hardware</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Adicione algumas opções de kernel, pressionando o <emphasis role=\"bold"
+#~ "\">F6</emphasis> chave para o modo de legado <emphasis role = \"bold"
+#~ "\">ou</emphasis> a chave para o modo de UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Se a instalação falhar, então pode ser necessário tentar de novo "
+#~ "utilizando uma das opções adicionais. O menu chamado por F6 exibe uma "
+#~ "nova linha chamada <guilabel>opções de inicialização</guilabel> e propor "
+#~ "quatro entradas:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Adicionar mais opções de kernel, pressionando a tecla F1 (apenas modo "
+#~ "Legado)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Usando uma Rede Cabeada"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Aqui está a tela padrão de boas-vindas quando se usa o CD de Instalação "
+#~ "baseado em Rede Cabeada (imagens netinstall.iso ou netinstall-nonfree."
+#~ "iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Ele não permite a alteração da língua, as opções disponíveis estão "
+#~ "descritos na tela. Para mais informações sobre o uso de um CD de "
+#~ "instalação baseada em rede com fio, consulte <link ns2:href=\"https://"
+#~ "wiki.mageia.org/en/Boot.iso_install\"> o Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "O layout do teclado é o americano."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Se selecionado, \"Com X\" também incluirá IceWM como ambiente de trabalho "
+#~ "leve."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Você pode ajustar o seu nível de segurança aqui."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Deixe as configurações padrão como estão, se você não sabe o que escolher."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Mídia Live: você pode inicializar a mídia em um sistema Mageia real sem "
+#~ "instalá-lo, para ver o que você terá após a instalação. O processo de "
+#~ "instalação é semelhante, mas você fará menos escolhas."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Mídia de CD somente de Inicialização"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Verifique a de opção Salvar arquivo."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Você também pode usar a ferramenta dd em um console:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Desligue o seu dispositivo USB, e pronto"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Utilize esta opção para uma nova instalação <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."
+#~ msgstr ""
+#~ "Se você tiver um ou mais <application>Mageia</application> instalações em "
+#~ "seu sistema, o instalador irá permitir que você atualize um deles para a "
+#~ "versão mais recente."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Como"
diff --git a/docs/docs/stable/installer/ro.po b/docs/docs/stable/installer/ro.po
index 38406f9a..97231066 100644
--- a/docs/docs/stable/installer/ro.po
+++ b/docs/docs/stable/installer/ro.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2016-10-28 16:09+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -33,12 +33,13 @@ msgstr "Licența și Notele ediției"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -71,8 +72,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Pentru a-l accepta, apăsați pe <guilabel>Accept</guilabel> și apoi pe "
@@ -95,22 +97,23 @@ msgstr "Nota ediției"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Pentru a vedea noutățile acestei versiuni de <application>Mageia</"
 "application>, apăsați pe butonul <guibutton>Nota ediției</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "ro"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selectare medii (configurați mediile de instalare suplimentare)"
 
@@ -118,23 +121,25 @@ msgstr "Selectare medii (configurați mediile de instalare suplimentare)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "În acest ecran este afișată lista cu depozitele deja recunoscute. Puteți "
 "adăuga alte surse de pachete, precum o unitate optică sau o sursă distantă. "
@@ -142,23 +147,25 @@ msgstr ""
 "selectat în etapele următoare."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Pentru o sursă de rețea trebuiesc urmate două etape:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Alegerea și activarea rețelei, dacă nu este deja activată."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Selectarea unui server alternativ sau specificarea unui URL (prima intrare). "
 "Prin selectarea unui server alternativ veți avea acces la toate depozitele "
@@ -166,14 +173,15 @@ msgstr ""
 "puteți desemna un depozit specific sau instalația NFS proprie."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Dacă actualizați o instalare pe 64 de biți care conține și pachete pe 32 de "
 "biți, este recomandat să utilizați acest ecran pentru a adăuga un server "
@@ -189,7 +197,7 @@ msgstr "Gestionare utilizatori și administratori"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -203,21 +211,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Definiți parola administratorului (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Pentru toate instalările de <application>Mageia</application> se recomandă "
 "să definiți o parolă de superutilizator sau administrator, cunoscută și ca "
@@ -228,9 +236,10 @@ msgstr ""
 "două parole pentru a vă asigura că nu ați tastat greșit."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Toate parolele sînt sensibile la majuscule și este foarte recomandat să "
@@ -238,16 +247,18 @@ msgstr ""
 "caractere speciale."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduceți un utilizator"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Adăugați un utilizator la această etapă. Un utilizator dispune de mai puține "
 "drepturi ca un administrator (root), însă suficiente pentru a putea naviga "
@@ -255,7 +266,7 @@ msgstr ""
 "ce un utilizator obișnuit poate face cu calculatorul său."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -264,7 +275,7 @@ msgstr ""
 "pictograma utilizatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -273,10 +284,11 @@ msgstr ""
 "utilizatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Numele contului</guilabel>: introduceți aici numele contului "
@@ -285,42 +297,43 @@ msgstr ""
 "majuscule.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Parolă</guilabel>: tastați aici parola utilizatorului. La capătul "
 "căsuței de dialog există un scut care indică puterea parolei. (Vedeți și "
 "<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Parola (din nou)</guilabel>: retastați aici parola utilizatorului "
 "și drakx va verifica dacă ați tastat aceeași parolă în ambele căsuțe."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 #, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Toți utilizatorii adăugați în cursul instalării distribuției Magaiea vor "
 "avea un director personal ce poate fi consultat de toată lumea (însă "
 "protejat la scriere)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -330,89 +343,60 @@ msgstr ""
 "utilizatori</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Drepturile de acces pot fi modificate și după instalare."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gestionare avansată utilizatori"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Dacă apăsați butonul <guibutton>Avansat</guibutton> vi se va prezenta un "
 "ecran în care veți putea edita parametrii conturilor utilizatorilor pe care "
 "îi adăugați."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Adițional, puteți dezactiva sau activa un cont invitat."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Tot ceea ce un invitat, conectat cu un cont invitat implicit "
-"<emphasis>rbash</emphasis>, înregistrează în directorul său /home va fi "
-"șters la deconectare.  Utilizatorul invitat trebuie să-și salveze fișierele "
-"importante pe o cheie USB."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Activează contul invitat</guilabel>: aici puteți activa sau "
-"dezactiva contul invitat. Contul invitat permite unui invitat să se "
-"conecteze și să utilizeze un calculator, însă are drepturi mult mai "
-"restrînse decît un utilizator normal."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Interpretor</guilabel>: această listă derulantă vă permite să "
 "schimbați interpretorul folosit de utilizatorul adăugat în etapa precedentă, "
 "iar opțiunile sînt Bash, Dash și Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID Utilizator</guilabel>: definiți aici ID-ul pentru utilizatorul "
 "adăugat în etapa precedentă. ID-ul este un număr. Lăsați gol dacă nu știți "
 "despre ce este vorba."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID Grup</guilabel>: indicați aici ID-ul grupului. Acesta este tot "
-"un număr, de obicei același cu ID-ul utilizatorului. Lăsați gol dacă nu "
-"știți despre ce este vorba."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Alegeți punctele de montare"
 
@@ -429,13 +413,14 @@ msgstr "Alegeți punctele de montare"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -445,7 +430,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -456,41 +441,45 @@ msgstr ""
 "application>, puteți modifica punctele de montare."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Dacă modificați totul, asigurați-vă că încă mai aveți partiția <literal>/</"
 "literal> (rădăcină)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Fiecare partiție este afișată după cum urmează: „Dispozitiv” („Capacitate”, "
 "„Punct de montare”, „Tip”)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"„Dispozitiv” este alcătuit din: „disc dur”, [„numărul discului "
-"dur”(literă)], „numărul partiției” (de exemplu: „sda5”)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Dacă aveți multe partiții, puteți alege mai multe puncte de montare diferite "
 "din meniul derulant, precum <literal>/</literal>, <literal>/home</literal> "
@@ -500,20 +489,22 @@ msgstr ""
 "home</literal> a unei instalări de Cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Puteți lăsa gol punctul de montare pentru partițiile pentru care nu aveți "
 "nevoie să le accesați."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Alegeți <guibutton>Înapoi</guibutton> dacă nu sînteți sigur ce să alegeți și "
 "apoi apăsați pe <guilabel>Partiționare de disc personalizată</guilabel>. În "
@@ -521,7 +512,7 @@ msgstr ""
 "mărimea."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -789,8 +780,9 @@ msgstr "Selectarea biroului"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "În funcție de alegerea de aici vi se vor prezenta ecrane suplimentare pentru "
@@ -798,8 +790,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -819,14 +812,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Alegeți dacă preferați să utilizați mediul de birou <application>KDE</"
 "application> sau <application>Gnome</application>. Ambele vin cu o colecție "
@@ -855,8 +850,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -868,24 +864,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Stație de lucru."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Mediu grafic de lucru"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Selectare individuală a pachetelor: puteți utiliza această opțiune pentru a "
 "adăuga sau înlătura manual pachetele."
@@ -894,37 +894,39 @@ msgstr ""
 #: en/choosePackageGroups.xml:38
 #, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Pentru intrucțiuni despre cum să faceți o instalare minimalistă  (cu sau "
 "fără X &amp; IceWM), citiți <xref linkend=\"minimal-install\"></xref>."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Selectare individuală a pachetelor"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Aici puteți înlătura sau adăuga pachete suplimentare pentru a vă personaliza "
 "instalarea."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -939,47 +941,45 @@ msgstr ""
 "buton și alegeți să o încărcați."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Configurați serviciile"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Aici puteți configura care din servicii să (nu) se lanseze la pornirea "
 "sistemului."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Sînt patru grupuri, faceți clic pe triunghiul din fața grupului pentru a-l "
-"destinde și vedea toate serviciile din el."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Configurările alese de DrakX sînt de obicei bune."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -988,7 +988,7 @@ msgstr ""
 "infobula de dedesubt."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Faceți modificări numai în cazul în care știți foarte bine ceea ce faceți."
@@ -1002,12 +1002,13 @@ msgstr "Configurați fusul orar"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1017,18 +1018,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Alegeți fusul orar alegînd țara sau un oraș prin apropiere din același fus "
 "orar."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "În ecranul următor veți putea configura ceasul intern pe ora locală sau pe "
 "GMT, cunoscut și ca UTC."
@@ -1043,23 +1046,24 @@ msgstr ""
 "asigurați-vă că toate sînt configurate pe ora locală, sau toate pe UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Alegeți un server X (configurați placa grafică)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1068,7 +1072,7 @@ msgstr ""
 "identifica, în general, corect placa grafică. "
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1077,37 +1081,30 @@ msgstr ""
 "aveți, o puteți alege din arborescență:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "fabricant"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "api numele plăcii"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "și tipul plăcii"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Dacă nu găsiți placa grafică în lista fabricantului (nu este încă în baza de "
-"date sau este o placă grafică mai veche) puteți încerca să găsiți un pilot "
-"potrivit în categoria <emphasis>Xorg</emphasis>."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Categoria <emphasis>Xorg</emphasis> conține mai mult de 40 de piloți "
 "generici și cu sursă deschisă de plăci grafice. Dacă nu găsiți un pilot "
@@ -1115,64 +1112,68 @@ msgstr ""
 "<emphasis>vesa</emphasis> care oferă funcționalități de bază."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Aveți grijă că dacă selectați un pilot incompatibil veți avea acces numai la "
 "interfața în linie de comandă."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Unii fabricanți de plăci grafice oferă piloți pentru Linux care sînt "
 "disponibili numai în depozitul Nonfree, iar în unele cazuri aceștia sînt "
 "disponibili numai pe situl Internet al fabricantului."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Pentru a-i putea accesa, depozitul Nonfree trebuie activat în mod explicit. "
 "Dacă nu l-ați activat în etapele precedente, trebuie s-o faceți după prima "
 "repornire."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Configurare placă grafică și ecran"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Indiferent de mediul grafic (cunoscut și ca mediu de birou) ales pentru "
 "această instalare de <application>Mageia</application>, toate se bazează pe "
@@ -1185,7 +1186,7 @@ msgstr ""
 "alegarea este incorectă. "
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1194,13 +1195,14 @@ msgstr ""
 "grafică din listă dacă este necesar."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: puteți alege "
 "<guilabel>Plug'n Play</guilabel> atunci cînd este cazul, ori unul din lista "
@@ -1210,30 +1212,31 @@ msgstr ""
 "monitorului."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Ratele de împrospătare incorecte pot distruge monitorul."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Rezoluție</guibutton></emphasis>: definiți aici "
 "rezoluția și adîncimea de culori dorite pentru monitor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: butonul de test nu apare "
 "mereu în cursul instalării. Dacă este prezent, puteți controla parametrii "
@@ -1244,7 +1247,7 @@ msgstr ""
 "disponibil, fiți precauți și reverificați parametrii aleși.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1253,12 +1256,12 @@ msgstr ""
 "dezactiva diverse opțiuni."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Alegeți monitorul"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1267,35 +1270,36 @@ msgstr ""
 "general va identifica în mod corect monitorul."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Selectarea unui monitor cu caracteristici diferite poate distruge "
 "monitorul sau placa grafică. Vă rugăm să nu încercați nimic dacă nu știți ce "
 "faceți.</emphasis> Dacă aveți dubii consultați documentația monitorului."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalizat</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1308,7 +1312,7 @@ msgstr ""
 "rata orizontală de sincronizare este frecvența cu care sînt afișate liniile."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1321,12 +1325,12 @@ msgstr ""
 "monitorului."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1335,12 +1339,12 @@ msgstr ""
 "din baza de date cu monitoare."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Fabricant</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1350,28 +1354,30 @@ msgstr ""
 "ordine:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "numele fabricantului monitorului"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "descrierea monitorului"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Generic</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Selecționarea acestui grup vă permite să alegeți dintre 30 de configurații "
 "de afișare precum 1024x768 @ 60Hz și cuprinde ecranele plate precum cele "
@@ -1381,12 +1387,12 @@ msgstr ""
 "recomandă să fiți prudent în alegeri."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partiționare de disc personalizată cu DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1398,12 +1404,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Dacă doriți să criptați partiția <literal>/</literal> trebuie să vă "
 "asigurați că aveți o partiție <literal>/boot</literal> separată. NU activați "
@@ -1411,88 +1419,89 @@ msgstr ""
 "putea demara."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Aici configurați compartimentarea discurilor. Puteți crea și înlătura "
 "partiții, schimba sistemul de fișiere al unei partiții, sau modifica "
 "dimensiunea și chiar vizualiza conținutul ei înainte de a începe."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Este prezentă cîte o categorie pentru fiecare disc detectat sau dispozitiv "
-"de stocare, precum o cheie USB. De exemplu: sda, sdb și sdc dacă sînt trei."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Apăsați pe <guibutton>Șterge toate partițiile</guibutton> pentru a șterge "
 "toate partițiile de pe dispozitivul de stocare selectat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Pentru toate celelalte acțiuni: faceți mai întîi clic pe partiția dorită. "
 "Apoi o puteți vizualiza, alege un sistem de fișiere sau punct de montare, "
 "redimensiona sau chiar șterge."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Continuați pînă cînd ajustați totul așa cum doriți."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Apăsați pe <guibutton>Gata</guibutton> cînd sînteți pregătit."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 #, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Dacă instalați Mageia pe un sistem UEFI, verificați că o partiție de sistem "
 "EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1502,7 +1511,7 @@ msgstr ""
 "EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1515,32 +1524,34 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partiționare"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "În acest ecran puteți vedea conținutul discurilor dure și soluțiile de "
 "partiționare găsite de asistentul DrakX unde să instalați "
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Opțiunile disponibile din lista de mai jos pot varia în funcție de schema de "
 "partiționare și conținutul discurilor."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1553,12 +1564,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Utilizează partițiile existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1567,12 +1578,12 @@ msgstr ""
 "compatibile Linux au fost găsite și pot fi utilizate pentru instalare."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Utilizează spațiul liber"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1581,12 +1592,12 @@ msgstr ""
 "utiliza pentru noua instalare de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utilizează spațiul liber de pe o partiție Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1595,7 +1606,7 @@ msgstr ""
 "vă poate propune să-l utilizeze."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1606,7 +1617,7 @@ msgstr ""
 "că v-ați salvat toate datele importante!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1623,12 +1634,14 @@ msgstr ""
 "Este foarte recomandat să vă salvați toate fișierele personale."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Cu această opțiune, instalatorul afișează partițiile Windows rămase cu "
 "albastru deschis și viitoarele partiții Mageia cu albastru închis, împreună "
@@ -1637,37 +1650,38 @@ msgstr ""
 "imaginea de mai jos."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Șterge și utilizează tot discul."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Această opțiune va utiliza tot discul pentru Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "ATENȚIE: aceasta va șterge TOATE datele de pe discul selecționat. Aveți "
 "grijă!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1678,13 +1692,13 @@ msgstr ""
 "această opțiune."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Partiționare de disc personalizată cu DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1693,71 +1707,84 @@ msgstr ""
 "dure."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 #, fuzzy
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Instalatorul va împărți spațiul disponibil pe disc după următoarele reguli:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Dacă spațiul total disponibil este sub 50 Go, se va crea doar o singură "
 "partiție pentru /, nu se va crea și o partiție separată pentru /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Dacă spațiul total disponibil este de peste 50 Go, atunci se vor crea trei "
 "partiții"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 din spațiul total disponibil va fi alocat pentru / cu un maximum de 50 "
 "Go"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 va fi alocat pentru swap cu un maximum de 4 Go"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "restul spațiului (de cel puțin 12/19) va vi alocat pentru /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Asta înseamnă că de la 160 Go în sus de spațiu disponibil, instalatorul va "
 "crea trei partiții: 50 Go pentru /, 4 Go pentru swap și restul pentru /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 #, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Dacă utilizați un sistem UEFI, partiția ESP (EFI System Partition) va fi "
 "detectată automat sau creată dacă nu există încă și montată în /boot/EFI. "
@@ -1765,17 +1792,17 @@ msgstr ""
 "acest lucru a fost făcut corect."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1787,7 +1814,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1797,15 +1824,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Unele discuri mai noi utilizează sectoare logice de 4096 octeți în locul "
 "standardului precedent de 512 octeți. Din cauză că nu am dispus de un astfel "
@@ -1816,19 +1844,22 @@ msgstr ""
 "gparted, sau să folosiți parametrii următori:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Aliniază la\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Spațiu liber precedent (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "De asemenea, verificați că toate partițiile sînt create cu un număr par de "
 "megaocteți."
@@ -1839,7 +1870,7 @@ msgid "Installation from LIVE medium"
 msgstr "Instalare de pe mediul LIVE"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1854,18 +1885,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Documentația oficială pentru Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1877,7 +1908,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1889,7 +1920,7 @@ msgstr ""
 "\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1902,13 +1933,13 @@ msgstr ""
 "link>."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1920,26 +1951,34 @@ msgstr ""
 "instalării."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalare cu DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februarie 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1947,7 +1986,7 @@ msgstr "Felicitări"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1958,7 +1997,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1969,17 +2008,18 @@ msgstr ""
 "redemara calculatorul."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "După redemarare, în ecranul încărcătorului de sistem, veți putea alege "
 "dintre sistemele de operare instalate pe acest sistem (dacă aveți mai mult "
 "de unul)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1988,12 +2028,12 @@ msgstr ""
 "fi selectată și pornită automat."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Profitați!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2009,31 +2049,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2045,21 +2085,19 @@ msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Generic</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2067,28 +2105,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatare în curs"
 
@@ -2097,38 +2135,39 @@ msgstr "Formatare în curs"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Aici puteți alege care din partiții doriți să le formatați. Datele de pe "
 "partițiile <emphasis>nebifate</emphasis> pentru formatare vor fi păstrate."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr "În general trebuiesc formatate cel puțin partițiile selectate de DralX"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2137,12 +2176,13 @@ msgstr ""
 "doriți să le verificați de <emphasis>sectoare defecte</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Dacă nu sînteți sigur că ați făcut alegerea potrivită, puteți face clic pe "
 "<guibutton>Înapoi</guibutton>, din nou pe <guibutton>Înapoi</guibutton> și "
@@ -2150,7 +2190,7 @@ msgstr ""
 "principal. În acel ecran puteți alege să vedeți ce se află pe partiții."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2159,12 +2199,12 @@ msgstr ""
 "guibutton> pentru a continua."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalatorul Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2175,7 +2215,7 @@ msgstr ""
 "se poate de ușor."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2184,64 +2224,74 @@ msgstr ""
 "care va lansa instalatorul, care în mod normal este tot ceea ce vă trebuie."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Ecranul de bun venit al instalării"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Se utilizează un încărcător de sistem Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Iată ecranele de întîmpinare implicite cînd utilizați un DVD Mageia. Primul "
 "cu un sistem vechi, iar al doilea cu un sistem UEFI:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Din acest prim ecran se pot defini cîteva preferințe personale:"
+#: 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:45
+#: 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 ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Limba (doar pentru instalare, poate fi diferită de limba aleasă pentru "
-"sistem) apăsînd tasta F2 (numai în modul vechi)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2250,39 +2300,24 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Utilizați tastele săgeți pentru a selecționa limba și apăsați tasta ENTER."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Aici aveți ca exemplu ecranul de întîmpinare, în franceză, cînd se "
-"utilizează un Live DVD/CD. Notați că meniul Live DVD/CD nu propune: "
-"<guilabel>Recuperare sistem</guilabel>, <guilabel>Test de memorie</guilabel> "
-"și <guilabel>Unealta de detecție materială</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "Schimbați rezoluția ecranului apăsînd tasta F3 (numai în modul vechi)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2291,54 +2326,54 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Adăugați opțiuni nucleului apăsînd tasta <emphasis role=\"bold\">F6</"
-"emphasis> pentru modul vechi sau tasta <emphasis role=\"bold\">e</emphasis> "
-"pentru modul UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Implicit, nu modifică nimic în opțiunile implicite."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
-"utilizînd una din opțiunile suplimentare. Meniul activat cu F6 afișează o "
-"linie nouă intitulată <guilabel>Opțiuni de demaraj</guilabel> și propune "
-"patru intrări:"
+"- Parametri siguri, prioritatea este oferită opțiunilor mai sigure în "
+"detrimentul performanțelor. "
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Implicit, nu modifică nimic în opțiunile implicite."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Fără ACPI (Advanced Configuration and Power Interface), gestionarea "
 "energiei nu este luată în considerare."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Fără APIC local (Local Advanced Programmable Interrupt Controller), este "
 "vorba de întreruperile la nivel de procesor, selectați această opțiune dacă "
 "sînteți întrebat."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2347,18 +2382,19 @@ msgstr ""
 "afișate pe linia <guilabel>Opțiuni de demaraj</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "În unele versiuni de Mageia, se poate întîmpla ca intrările selecționate cu "
 "tasta F6 să nu apară în linia <guilabel>Opțiuni de demaraj</guilabel>, însă "
 "acestea sînt luate în considerare."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2367,18 +2403,13 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Adăugați mai multe opțiuni nucleului apăsînd tasta F1 (numai în modul vechi)"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 #, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Apăsarea tastei F1 deschide o fereastră nouă cu mai multe opțiuni "
 "disponibile. Selectați una cu tastele săgeți și apăsați Enter pentru a avea "
@@ -2386,7 +2417,7 @@ msgstr ""
 "întîmpinare."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2395,12 +2426,13 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Vederea detaliată a opțiunii splash. Apăsați ESC sau selectați "
 "<guilabel>Înapoi la opțiunile de demaraj</guilabel> pentru a reveni la lista "
@@ -2408,7 +2440,7 @@ msgstr ""
 "de demaraj</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2417,12 +2449,15 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Cu tasta F2 aveți ajutorul tradus în limba aleasă."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2433,83 +2468,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-#, fuzzy
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Acesta este ecranul de întîmpinare implicit cînd se utilizează un CD de "
-"instalare prin rețea filară (imaginea Boot.iso sau Boot-Nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Nu permite schimbarea limbii, opțiunile disponibile sînt descrise direct pe "
-"ecran. Pentru informații suplimentare despre utilizarea CD-ului de instalare "
-"prin rețea filară, consultați <link ns2:href=\"https://wiki.mageia.org/en/"
-"Boot.iso_install\">Mageia Wiki</link>."
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Dispunerea tastaturii este cea americană."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Etapele instalării"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Procesul de instalare este divizat într-un anumit număr de etape, care pot "
 "fi urmărite în acest panou lateral al ecranului."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Fiecare etapă are una sau mai multe ecrane, care pot avea la rîndul lor "
 "butoane <guibutton>Avansat</guibutton> cu opțiuni suplimentare, de obicei "
 "mai puțin necesare."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Majoritatea ecranelor au butoane <guibutton>Ajutor</guibutton> care dau mai "
 "multe explicații pentru etapa actuală."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2527,17 +2527,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultan pentru a reporni."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Probleme de instalare și soluții posibile"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Fără interfață grafică"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2548,13 +2548,16 @@ msgstr ""
 "utilizați o rezoluție mai mică tastînd <code>vgalo</code> la prompter."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Dacă mașina este foarte veche, instalarea în mod grafic poate să nu fie "
 "posibilă. În acest caz merită încercată o instalare în mod text. Pentru "
@@ -2564,12 +2567,12 @@ msgstr ""
 "text."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instalarea îngheață"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2585,14 +2588,15 @@ msgstr ""
 "opțiuni."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problemă de memorie"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2603,18 +2607,20 @@ msgstr ""
 "corectă de RAM. Ex: <code>mem=256M</code> va specifica 256Mo de RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Partiții dinamice"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Dacă doriți să convertiți discul dur din formatul de „bază” în formatul "
 "„dinamic” din Microsoft Windows, trebuie să știți că nu veți mai putea "
@@ -2633,18 +2639,19 @@ msgstr "Actualizări"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2653,10 +2660,11 @@ msgstr ""
 "unele pachete au fost actualizate sau îmbunătățite."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Alegeți <guilabel>da</guilabel> dacă doriți să le descărcați și să le "
@@ -2664,8 +2672,9 @@ msgstr ""
 "lucru acum, sau dacă nu sînteți conectat la Internet."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Apoi apăsați pe <guibutton>Înainte</guibutton> pentru a continua"
 
 #. type: Content of: <section><info><title>
@@ -2722,18 +2731,19 @@ msgstr "Selectare medii (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2746,7 +2756,7 @@ msgstr ""
 "selectat pe parcursul etapelor următoare."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2755,7 +2765,7 @@ msgstr ""
 "baza distribuției."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2770,13 +2780,14 @@ msgstr ""
 "ATI, microcod pentru diverse plăci WiFi, etc."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Depozitul <emphasis>Tainted</emphasis> include pachete publicate sub o "
 "licență liberă. Criteriul principal pentru plasarea pachetelor în acest "
@@ -2785,37 +2796,40 @@ msgstr ""
 "audio/video, pachete necesare pentru redarea DVD-urilor comerciale, etc."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalare minimală"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Puteți alege o instalare minimalistă deselectînd tot din ecranul cu selecția "
 "grupurilor de pachete, vedeți <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Dacă doriți, puteți bifa în plus opțiunea „Selectare individuală a "
 "pachetelor” din același ecran."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Instalarea minimalistă este destinată pentru cei cu utilizări specifice de "
 "<application>Mageia</application>, precum un server sau o stație de lucru "
@@ -2825,24 +2839,24 @@ msgstr ""
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Dacă alegeți această clasă de instalare, ecranul următor vă va oferi cîteva "
 "opțiuni de instalare suplimentare și foarte utile, precum documentația și X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Dacă este selectat „Cu X” se va include și IceWM ca mediu de birou lejer."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2857,15 +2871,16 @@ msgstr ""
 "coreutils/manual/\">GNU coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2882,11 +2897,12 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX a făcut alegeri inteligente pentru configurația sistemului în funcție "
 "de opțiunile pe care le-ați ales și de componentele materiale detectate. "
@@ -2896,8 +2912,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2912,74 +2928,76 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parametri sistem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fus orar</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DracX a selecționat un fus orar în funcție de limba pe care ați ales-o. Îl "
 "puteți schimba dacă este nevoie. Vedeți și <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Țară / Regiune</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Este foarte important să corectați acest parametru dacă nu vă aflați în țara "
 "selecționată. Vedeți <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Încărcător de sistem</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "DrakX a făcut o alegeri bune pentru parametrii încărcătorului de sistem."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 msgstr "Nu schimbați nimic dacă nu știți cum să configurați Grub și/sau Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Pentru mai multe informații, consultați <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestionare utilizatori</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2988,22 +3006,23 @@ msgstr ""
 "director <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servicii</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Serviciile sistem se referă la acele programe mici care se execută în fundal "
 "(demoni). Această unealtă vă permite să activați sau să dezactivați anumite "
 "sarcini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3012,44 +3031,45 @@ msgstr ""
 "poate împiedica funcționarea corectă a calculatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Pentru mai multe informații, consultați <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parametrii fizici"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastatură</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Aici puteți configura sau schimba dispunerea tastaturii, care va depinde de "
 "locația voastră, de limbă și de tipul tastaturii."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Maus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3058,41 +3078,42 @@ msgstr ""
 "tablete, trackball-uri, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Placă de sunet</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Instalatorul utilizează pilotul implicit, dacă există. Opțiunea pentru a "
 "selecționa un alt pilot este propusă numai cînd există mai mulți piloți "
 "pentru acestă placă, însă nici unul dintre ei nu este cel implicit."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfață grafică</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Această secțiune vă permite să configurați plăcile grafice și ecranele."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Pentru mai multe informații, consultați <xref linkend=\"configureX_chooser\"/"
 ">."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -3103,20 +3124,21 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parametrii de rețea și Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rețea</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3126,21 +3148,22 @@ msgstr ""
 "încă depozitele mediilor Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Cînd adăugați o placă de rețea, nu uitați să configurați parafocul ca să "
 "supravegheze și acea interfață."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxyuri</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3151,26 +3174,27 @@ msgstr ""
 "serviciu de proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "S-ar putea să aveți nevoie să consultați administratorul sistemului pentru a "
 "obține parametrii pe care trebuie să-i introduceți aici."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Securitate"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivel de securitate</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3180,18 +3204,18 @@ msgstr ""
 "pentru o utilizare o obișnuită."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 "Bifați opțiunea care se potrivește cel mai bine cu modul  de utilizare."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Parafoc</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3200,7 +3224,7 @@ msgstr ""
 "escrocii de pe Internet care le-ar putea compromite sau fura."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 #, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
@@ -3211,7 +3235,7 @@ msgstr ""
 "depinde de modul în care utilizați calculatorul."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Țineți cont că poate fi foarte riscant dacă permiteți totul (fără parafoc)."
@@ -3288,39 +3312,74 @@ msgstr ""
 "a instala <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Nivel de securitate"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Aici puteți regla nivelul de securitate."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "Lăsați parametrii impliciți așa cum sînt dacă nu știți ce să alegeți."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "După instalare, va fi tot timpul posibil să ajustați parametrii de "
 "securitate în secțiunea <guilabel>Securitate</guilabel> din Centrul de "
@@ -3338,25 +3397,27 @@ msgstr "Introducere"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia este distribuită prin imagini ISO. Această pagină vă va ajuta să "
 "alegeți imaginea care se potrivește nevoilor voastre."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Există două familii de medii:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Instalatorul clasic: După ce ați demarat de pe mediul de instalare, va urma "
 "un proces care vă va permite să alegeți ce să instalați și cum să vă "
@@ -3366,83 +3427,87 @@ msgstr ""
 "instalați."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Mediul LIVE: Puteți demara de pe mediul de instalare un sistem real Mageia "
-"fără să-l instalați pentru a putea vedea ce veți obține după instalare. "
-"Procesul de instalare este mai simplu, însă aveți mai puține opțiuni."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Detaliile sînt oferite în secțiunile următoare."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Medii"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definiție"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Aici, un mediu (plural: medii) este o imagine ISO ce permite instalarea și/"
 "sau actualizarea distribuției Mageia și prin extensie orice suport fizic pe "
 "care poate fi copiat fișierul ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Le puteți găsi <link ns4:href=\"http://www.mageia.org/en/downloads/\">aici</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Mediile de instalare clasice"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Caracteristici comune"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Aceste imagini ISO utilizează instalatorul tradițional numit drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Acestea sînt capabile să efectueze o instalare nouă sau o actualizare de la "
 "o versiune precedentă."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Diferitele medii pentru arhitectură pe 32 sau 64 de biți."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3451,12 +3516,12 @@ msgstr ""
 "Test de memorie, Unealta de detecție materială"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Fiecare DVD conține multe medii de birou și limbi disponibile."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3464,106 +3529,111 @@ msgstr ""
 "proprietare."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Mediile Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Poate fi utilizat pentru a previzualiza distribuția Mageia fără a o instala "
 "și opțional să o instalați pe discul dur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 #, fuzzy
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Fiecare imagine ISO conține numai un mediu de birou (KDE sau GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Imaginile Live ISO pot fi utilizate doar pentru a "
 "efectua instalări noi, nu pot fi utilizate pentru actualizări majore de la "
 "versiunile precedente.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Acestea conțin aplicații proprietare."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "LiveDVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 #, fuzzy
 msgid "Plasma desktop environment only."
 msgstr "Doar mediul de birou KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Toate limbile sînt prezente."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "LiveDVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Doar mediul de birou GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 #, fuzzy
 msgid "Live DVD Xfce"
 msgstr "LiveDVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 #, fuzzy
 msgid "Xfce desktop environment only."
 msgstr "Doar mediul de birou KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 #, fuzzy
 msgid "32 or 64 bit architectures."
 msgstr "Diferitele medii pentru arhitectură pe 32 sau 64 de biți."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "CD-uri doar pentru demarat"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Lansează instalarea"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3575,11 +3645,12 @@ msgstr ""
 "pe Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Aceste medii sînt foarte lejere (mai puțin de 100 Mo) și sînt convenabile "
 "pentru cazurile cînd lățimea de bandă este prea mică pentru a descărca un "
@@ -3587,18 +3658,19 @@ msgstr ""
 "calculator care nu poate demara de pe o cheie USB."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Doar limba engleză."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 #, fuzzy
 msgid "netinstall.iso"
 msgstr "Lansează instalarea"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
@@ -3637,9 +3709,9 @@ msgstr "Descărcare"
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Odată ce ați ales fișierul ISO, îl puteți descărca utilizînd HTTP sau "
 "BitTorrent. În ambele cazuri o fereastră vă va oferi anumite informații, "
@@ -3655,9 +3727,9 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 #: en/SelectAndUseISOs2.xml:195
 #, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum și sha1sum sînt unelte pentru verificarea integrității imaginilor "
 "ISO. Utilizați doar una din ele. Păstrați una din ele <link linkend="
@@ -3671,8 +3743,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Bifați butonul radio „Salvează fișierul”."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3681,15 +3753,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Se verifică integritatea mediului descărcat"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 #, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Ambele sume de control sînt numere hexazecimale calculate de un algoritm cu "
 "fișierul ce va fi descărcat. Cînd îi cereți algoritmului să recalculeze "
@@ -3698,69 +3770,84 @@ msgstr ""
 "un eșec. În caz de eșec trebuie să încercați să-l mai descărcați o dată."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Deschideți o consolă, trebuie să fiți root, și:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Pentru a utiliza md5sum, tastați: [sam@localhost]$ <userinput>md5sum path/"
 "to/the/image/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Pentru a utiliza sha1sum, tastați: [sam@localhost]$ <userinput>sha1sum "
 "path/to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"și comparați numărul obținut pe calculator (va trebui să așteptați un pic) "
-"cu numărul dat de Mageia. Exemplu:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"și comparați numărul obținut pe calculator (va trebui să așteptați un pic) "
+"cu numărul dat de Mageia. Exemplu:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Inscripționați sau copiați imaginea ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Imaginea ISO verificată poate fi acum inscripționată pe un CD/DVD sau pusă "
 "pe o cheie USB. Aceste operații nu sînt simple copieri și au ca scop să "
 "producă medie de pe care se poate demara."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Inscripționarea imaginii ISO pe un CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Puteți utiliza orice aplicație de inscripționat doriți, însă asigurați-vă că "
 "este configurată corect pe <emphasis role=\"bold\">inscripționat o imagine</"
@@ -3769,12 +3856,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Puneți imaginea ISO pe o cheie USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3783,18 +3870,19 @@ msgstr ""
 "cheie USB pentru a demara și instala sistemul."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "„punerea” unei imagini pe un dispozitiv de memorie flash distruge orice "
 "sistem de fișiere aflat înainte pe acel dispozitiv; toate datele vor fi "
 "pierdute și capacitatea partiției va fi redusă la mărimea fișierului ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3803,12 +3891,12 @@ msgstr ""
 "reformatați cheia USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Utilizînd o unealtă grafică din Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3817,73 +3905,72 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Utilizînd o unealtă grafică din Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Puteți încerca:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "utilizînd opțiunea „ISO image\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Utilizînd linia de comandă dintr-un sistem GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Este potențial „periculos” să faceți acest lucru manual. Riscați să "
 "suprascrieți o partiție pe disc dacă aveți un ID de dispozitiv greșit."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Puteți utiliza utilitarul dd într-o consolă:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Deschideți o consolă"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Deveniți root cu comanda <userinput>su -</userinput> (nu uitați liniuța de "
 "la final '-' )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3892,28 +3979,40 @@ msgstr ""
 "gestionar de fișiere pentru a o citi)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Introduceți comanda <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Găsiți numele cheii USB (după mărime), de exemplu, în imaginea de mai sus "
+"<code>/dev/sdb</code> este o cheie USB de 8 Go."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Alternativ, puteți obține numele dispozitivului cu comanda <code>dmesg</"
 "code>, la sfîrșit veți vedea numele dispozitivului începînd cu <emphasis>sd</"
 "emphasis>, sau <emphasis>sdd</emphasis> în acest caz:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3955,47 +4054,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Găsiți numele cheii USB (după mărime), de exemplu, în imaginea de mai sus "
-"<code>/dev/sdb</code> este o cheie USB de 8 Go."
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Introduceți comanda: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Unde X=numele dispozitivului, ex: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Exemplu: # <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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Introduceți comanda: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Deconectați cheia USB, ați terminat."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4029,19 +4136,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Dacă țara dorită nu este în listă, faceți clic pe butonul <guilabel>Alte "
 "țări</guilabel> și alegeți de acolo țara / regiunea."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Dacă țara dorită se află doar în lista <guilabel>Alte țări</guilabel>, după "
@@ -4050,19 +4159,19 @@ msgstr ""
 "care ați făcut-o."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Metodă de intrare"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 #, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "În ecranul <guilabel>Alte țări</guilabel> puteți selecta și metoda de "
@@ -4076,68 +4185,67 @@ msgstr ""
 "mediile HTTP/FTP înainte de selecția pachetelor."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Dacă ați omis configurarea metodei de intrare în timpul instalării, o puteți "
 "accesa după redemararea sistemului instalat via „Configurați calculatorul” -"
 "&gt; „Sistem” sau executînd localedrake ca root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalare sau actualizare"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalare"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Utilizați această opțiune pentru o instalare nouă de <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Actualizare"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Aveți mai multe distribuții <application>Mageia</application> instalate pe "
-"calculator, instalatorul vă va permite să actualizați una din ele la ultima "
-"versiune."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Numai actualizarea de la o versiune precedentă de Mageia care era "
 "<emphasis>încă suportată</emphasis> cînd a fost realizat acest instalator, a "
@@ -4146,16 +4254,17 @@ msgstr ""
 "bine să faceți o instalare nouă păstrînd partiția <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Dacă vă decideți să opriți instalarea în curs, puteți reporni, dar vă rugăm "
 "să vă gîndiți de două ori înainte de a face acest lucru. Odată ce o partiție "
@@ -4167,12 +4276,14 @@ msgstr ""
 "guibutton> simultan pentru a reporni."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Dacă ați descoperit că ați uitat să selectați o limbă adițională, vă puteți "
 "întoarce din ecranul „Instalare sau actualizare” la ecranul de alegere a "
@@ -4207,12 +4318,12 @@ msgstr ""
 "fusul orar selectate precedent."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tastatură"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4222,16 +4333,17 @@ msgstr ""
 "US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4248,23 +4360,25 @@ msgstr ""
 "wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Dacă tastatura dorită nu se află în lista afișată, faceți clic pe "
 "<guibutton>Mai multe</guibutton> pentru a obține o listă completă și "
 "selectați-o de acolo."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "După ce ați ales o tastatură din căsuța de dialog <guibutton>Mai multe</"
 "guibutton>, vă veți întoarce la prima fereastră de dialog pentru alegerea "
@@ -4273,23 +4387,24 @@ msgstr ""
 "selecționată este cea pe care ați ales-o din lista completă."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Dacă alegeți o tastatură cu caractere non-latine, veți vedea un ecran de "
 "dialog suplimentar în care veți fi întrebat cum preferați să comutați între "
 "dispunerea latină și non-latină."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Alegeți limba ce va fi utilizată"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4300,7 +4415,7 @@ msgstr ""
 "instalării și după pentru pentru sistemul instalat."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -4311,12 +4426,13 @@ msgstr ""
 "instalării și după pentru pentru sistemul instalat."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "În cazul în care veți avea nevoie de mai multe limbi instalate în sistem, "
 "pentru uzul personal sau al celorlalți utilizatori, atunci trebuie să "
@@ -4325,7 +4441,7 @@ msgstr ""
 "instalare."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -4339,18 +4455,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Chiar dacă ați optat pentru mai multe limbi, va trebui să alegeți una din "
 "ele ca limbă preferată din primul ecran cu lista limbilor. Va fi de asemenea "
 "indicată drept limba preferată în ecranul multilingv."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4359,23 +4476,24 @@ msgstr ""
 "recomandat să instalați și limba pentru dispunerea tastaturii."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia utilizează UTF-8 (Unicode) implicit."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Acest lucru poate fi dezactivat în ecranul „multilingv” dacă știți că nu "
 "corespunde limbii dumneavoastră. Dezactivarea suportului UTF-8 se aplică "
 "tuturor limbilor instalate."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4430,24 +4548,24 @@ msgstr ""
 "șase sau mai multe butoane."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Adăugați sau modificați o intrare din meniul de demaraj"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 #, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Pentru informații suplimentare despre opțiunile nucleului pe sistemele vechi "
 "și UEFI consultați: <link ns2:href=\"https://wiki.mageia.org/en/"
@@ -4455,46 +4573,46 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
+#: en/setupBootloader.xml:18
 #, fuzzy
-msgid "Grub2-efi for a UEFI system."
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Cu un sistem UEFI"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 #, fuzzy
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Meniurile grafice Mageia sînt frumoase:"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4509,30 +4627,33 @@ msgstr ""
 "\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
+#: en/setupBootloader.xml:38
 #, fuzzy
-msgid "Grub2-efi on UEFI systems"
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Cu un sistem UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 #, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Pe un sistem UEFI interfața utilizator este un pic diferită deoarece nu "
 "puteți alege încărcătorul de sistem din moment ce numai Grub2-efi este "
 "disponibil."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4545,15 +4666,15 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 #, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Dacă Mageia este primul sistem instalat pe calculator, instalatorul a creat "
@@ -4565,38 +4686,39 @@ msgstr ""
 "sisteme de operare aveți instalate pe calculator."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Se utilizează un încărcător de sistem Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4609,18 +4731,19 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Se utilizează încărcătorul de sistem existent"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Procedura exactă pentru adăugarea sistemului Mageia la un încărcător de "
 "sistem existent depășește scopul acestui ajutor. Totuși, în majoritatea "
@@ -4629,20 +4752,20 @@ msgstr ""
 "sistem Mageia. Consultați documentația sistemului de operare în chestiune."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4655,14 +4778,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4671,130 +4794,125 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Parola (din nou)</guilabel>: retastați aici parola utilizatorului "
 "și drakx va verifica dacă ați tastat aceeași parolă în ambele căsuțe."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Servicii</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Configurare SCSI"
 
@@ -4807,36 +4925,39 @@ msgstr "Configurare SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "În general DrakX detectează corect discurile. La unele controlere SCSI mai "
 "vechi poate să nu determine corect piloții care trebuiesc utilizați și prin "
 "urmare eșuează la recunoașterea discurilor."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Dacă se întîmplă acest lucru, va trebui să-i indicați manual lui DrakX ce "
 "discuri SCSI aveți."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX va putea atunci să le configureze corect."
 
@@ -4858,10 +4979,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Acest ecran afișează numele pilotului pe care instalatorul l-a ales pentru "
 "placa de sunet, care va fi cel implicit dacă există unul."
@@ -4884,42 +5005,47 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Apoi, în draksound sau ecranul uneltei de „Configurarea sunetului”, apăsați "
 "pe <guibutton>Avansat</guibutton> și apoi pe <guibutton>Depanare</guibutton> "
 "pentru a găsi sfaturi utile despre cum să rezolvați problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avansat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Apăsarea pe <guibutton>Avansat</guibutton> în acest ecran, în cursul "
 "instalării, este utilă dacă nu există un pilot implicit dar sînt cîțiva "
 "disponibili și credeți că instalatorul l-a selecționat pe cel greșit. "
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "În acel caz puteți selecta un pilot diferit după ce faceți clic pe "
 "<guibutton>Alegerea unui pilot</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmați formatarea discului dur"
 
@@ -4930,13 +5056,13 @@ msgstr "Confirmați formatarea discului dur"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4946,18 +5072,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Faceți clic pe <guibutton>Înapoi</guibutton> dacă nu sînteți sigur de "
 "alegere."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Apăsați pe <guibutton>Înainte</guibutton> dacă sigur doriți să ștergeți "
 "toate partițiile, toate sistemele de operare și toate datele de pe acel disc."
@@ -5081,16 +5210,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Dezinstalare Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Îndrumar"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Dacă Mageia nu v-a convins sau nu ați putut să o instalați corect, pe scurt "
@@ -5098,28 +5223,30 @@ msgstr ""
 "posibilitatea de a o dezinstala. Acest lucru nu este valabil pentru toate "
 "sistemele de operare."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "După ce v-ați salvat datele, redemarați de pe DVD-ul Mageia și selectați "
 "„Recuperare sistem”, iar apoi „Restaurare încărcător de sistem Windows”. La "
 "următoarea redemarare veți avea numai Windows fără niciun alt meniu ca să vă "
 "alegeți sistemul de operare."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Pentru a recupera în Windows spațiul ocupat de partițiile Mageia, faceți "
 "clic pe <code>Start -> Control Panel -> Administrative Tools -> Computer "
@@ -5129,8 +5256,8 @@ msgstr ""
 "disc. Faceți clic pe una din aceste partiții și selectați <guibutton>Delete</"
 "guibutton>. Spațiul va fi eliberat."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5138,14 +5265,15 @@ msgstr ""
 "Dacă utilizați Windows XP, puteți crea o partiție nouă și s-o formatați "
 "(FAT32 sau NTFS). Aceasta va primi o literă de partiție."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Dacă aveți Vista sau 7, mai aveți o posibilitate în plus, puteți extinde "
 "partiția existentă care se află în partea stîngă a spațiului liber. Mai sînt "
@@ -5200,6 +5328,356 @@ msgstr ""
 "dura cîteva minute bune. La sfîrșit veți avea un ecran alb pentru cîteva "
 "momente, este normal."
 
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Parola (din nou)</guilabel>: retastați aici parola "
+#~ "utilizatorului și drakx va verifica dacă ați tastat aceeași parolă în "
+#~ "ambele căsuțe."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Adițional, puteți dezactiva sau activa un cont invitat."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Tot ceea ce un invitat, conectat cu un cont invitat implicit "
+#~ "<emphasis>rbash</emphasis>, înregistrează în directorul său /home va fi "
+#~ "șters la deconectare.  Utilizatorul invitat trebuie să-și salveze "
+#~ "fișierele importante pe o cheie USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Activează contul invitat</guilabel>: aici puteți activa sau "
+#~ "dezactiva contul invitat. Contul invitat permite unui invitat să se "
+#~ "conecteze și să utilizeze un calculator, însă are drepturi mult mai "
+#~ "restrînse decît un utilizator normal."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID Grup</guilabel>: indicați aici ID-ul grupului. Acesta este "
+#~ "tot un număr, de obicei același cu ID-ul utilizatorului. Lăsați gol dacă "
+#~ "nu știți despre ce este vorba."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "„Dispozitiv” este alcătuit din: „disc dur”, [„numărul discului "
+#~ "dur”(literă)], „numărul partiției” (de exemplu: „sda5”)."
+
+#~ msgid "Workstation."
+#~ msgstr "Stație de lucru."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Mediu grafic de lucru"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Sînt patru grupuri, faceți clic pe triunghiul din fața grupului pentru a-"
+#~ "l destinde și vedea toate serviciile din el."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Dacă nu găsiți placa grafică în lista fabricantului (nu este încă în baza "
+#~ "de date sau este o placă grafică mai veche) puteți încerca să găsiți un "
+#~ "pilot potrivit în categoria <emphasis>Xorg</emphasis>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Este prezentă cîte o categorie pentru fiecare disc detectat sau "
+#~ "dispozitiv de stocare, precum o cheie USB. De exemplu: sda, sdb și sdc "
+#~ "dacă sînt trei."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Instalatorul va împărți spațiul disponibil pe disc după următoarele "
+#~ "reguli:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Aliniază la\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Spațiu liber precedent (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 "Din acest prim ecran se pot defini cîteva preferințe personale:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Limba (doar pentru instalare, poate fi diferită de limba aleasă pentru "
+#~ "sistem) apăsînd tasta F2 (numai în modul vechi)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Aici aveți ca exemplu ecranul de întîmpinare, în franceză, cînd se "
+#~ "utilizează un Live DVD/CD. Notați că meniul Live DVD/CD nu propune: "
+#~ "<guilabel>Recuperare sistem</guilabel>, <guilabel>Test de memorie</"
+#~ "guilabel> și <guilabel>Unealta de detecție materială</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Adăugați opțiuni nucleului apăsînd tasta <emphasis role=\"bold\">F6</"
+#~ "emphasis> pentru modul vechi sau tasta <emphasis role=\"bold\">e</"
+#~ "emphasis> pentru modul UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Dacă instalarea eșuează, atunci poate fi necesar să încercați din nou "
+#~ "utilizînd una din opțiunile suplimentare. Meniul activat cu F6 afișează o "
+#~ "linie nouă intitulată <guilabel>Opțiuni de demaraj</guilabel> și propune "
+#~ "patru intrări:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Adăugați mai multe opțiuni nucleului apăsînd tasta F1 (numai în modul "
+#~ "vechi)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Acesta este ecranul de întîmpinare implicit cînd se utilizează un CD de "
+#~ "instalare prin rețea filară (imaginea Boot.iso sau Boot-Nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Nu permite schimbarea limbii, opțiunile disponibile sînt descrise direct "
+#~ "pe ecran. Pentru informații suplimentare despre utilizarea CD-ului de "
+#~ "instalare prin rețea filară, consultați <link ns2:href=\"https://wiki."
+#~ "mageia.org/en/Boot.iso_install\">Mageia Wiki</link>."
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Dispunerea tastaturii este cea americană."
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Dacă este selectat „Cu X” se va include și IceWM ca mediu de birou lejer."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Aici puteți regla nivelul de securitate."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Lăsați parametrii impliciți așa cum sînt dacă nu știți ce să alegeți."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Mediul LIVE: Puteți demara de pe mediul de instalare un sistem real "
+#~ "Mageia fără să-l instalați pentru a putea vedea ce veți obține după "
+#~ "instalare. Procesul de instalare este mai simplu, însă aveți mai puține "
+#~ "opțiuni."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "CD-uri doar pentru demarat"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Bifați butonul radio „Salvează fișierul”."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Puteți utiliza utilitarul dd într-o consolă:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Deconectați cheia USB, ați terminat."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Utilizați această opțiune pentru o instalare nouă de <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."
+#~ msgstr ""
+#~ "Aveți mai multe distribuții <application>Mageia</application> instalate "
+#~ "pe calculator, instalatorul vă va permite să actualizați una din ele la "
+#~ "ultima versiune."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Îndrumar"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -5215,9 +5693,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Personalizat"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5228,20 +5703,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Parametri siguri, prioritatea este oferită opțiunilor mai sigure în "
-#~ "detrimentul performanțelor. "
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -5481,21 +5942,6 @@ msgstr ""
 #~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
 #~ "</imageobject>"
 
-#~ msgid ""
-#~ "<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>"
-#~ 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>"
-
 #~ msgid "With a Bios system"
 #~ msgstr "Cu un sistem BIOS"
 
diff --git a/docs/docs/stable/installer/ru.po b/docs/docs/stable/installer/ru.po
index 2153be14..9cba6e4a 100644
--- a/docs/docs/stable/installer/ru.po
+++ b/docs/docs/stable/installer/ru.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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-08-05 16:53+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -37,12 +37,13 @@ msgstr "Условия лицензирования и заметки о вып�
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -76,8 +77,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Чтобы согласиться с условиями, отметьте пункт <guilabel>Принять</guilabel>, "
@@ -100,22 +102,23 @@ msgstr "Заметки о выпуске"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Чтобы ознакомиться со списком нововведений в <application>Mageia</"
 "application>, нажмите кнопку <guibutton>Заметки о выпуске</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "ru"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Выбор носителя (настройки дополнительных носителей пакетов для установки)"
@@ -124,23 +127,25 @@ msgstr ""
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "На этой странице будет представлен список определенных репозиториев пакетов. "
 "Вы сможете добавить другие источники пакетов, в частности оптический "
@@ -148,24 +153,26 @@ msgstr ""
 "какие из пакетов будут доступны для выбора на последующих шагах."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr ""
 "Чтобы добавить сетевой источник, необходимо выполнить два следующих шага:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Выбор и включение сети, если она еще не была включена."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Выбор зеркала или определение URL-адреса (первая запись). После выбора "
 "зеркала вы получите доступ к выбору всех репозиториев, которые используются "
@@ -175,14 +182,15 @@ msgstr ""
 "или развернутую вами с помощью NFS систему."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Если вы обновляете 64-битную версию системы, где могут содержаться какие-то "
 "32-битные пакеты, вам стоит воспользоваться этой страницей для добавления "
@@ -199,7 +207,7 @@ msgstr "Управление учётными записями пользова�
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -212,21 +220,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Восстановление пароля администратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "В каждой установленной системе <application>Mageia</application> следует "
 "определить пароль суперпользователя или администратора. Такой пароль в Linux "
@@ -237,25 +245,28 @@ msgstr ""
 "расположенном ниже, чтобы удостовериться, что пароль был введён без ошибок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Все пароли следует указывать с учетом регистра. Лучше использовать в пароле "
 "смесь букв (большие и маленькие), цифры и другие символы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Введите пользователя"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "С помощью этой панели вы можете добавить пользователей. Каждый пользователь "
 "имеет меньшие права доступа, чем суперпользователь (root), но достаточно "
@@ -263,7 +274,7 @@ msgstr ""
 "любых других задач, которые выполняются обычным пользователем за компьютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -272,7 +283,7 @@ msgstr ""
 "пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -281,10 +292,11 @@ msgstr ""
 "пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Имя пользователя</guilabel>: здесь вы можете ввести "
@@ -293,41 +305,44 @@ msgstr ""
 "пользователя чувствительно к регистру.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Пароль</guilabel>: в этом поле вам следует указать пароль. Цвет "
 "отметки защищенности рядом с полем соответствует сложности пароля (см. также "
 "<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Пароль (еще раз)</guilabel>: повторите ввод пароля в этом поле. "
-"DrakX проверит, совпадает ли  введенный повторно пароль с его первоначальным "
-"вариантом."
+"<guilabel>Пароль (ещё раз)</guilabel>: повторите ввод пароля пользователя в "
+"этом поле. drakx проверит, совпадает ли введённый повторно пароль с его "
+"первоначальным вариантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Содержимое домашних каталогов всех пользователей, записи которых будут "
 "созданы при установке Mageia, будут защищены от чтения и записи (umask = "
 "0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -337,73 +352,48 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Права доступа к домашним каталогам, конечно же, можно изменить и после "
 "завершения установки системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Дополнительные возможности управления учетными записями пользователей"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Если вы нажмете кнопку <guibutton>Дополнительно</guibutton>, то программа "
 "откроет диалоговое окно, с помощью которого вы сможете изменить параметры "
 "учетной записи, которую вы добавляете."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Кроме того, вы можете отключить или включить учётную запись гостя."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Любые данные, которые будут записаны с гостевого аккаунта <emphasis>rbash</"
-"emphasis> в соответствующий каталог в /home, будут потеряны при выходе из "
-"системы. Пользователю гостевого аккаунта следует позаботиться о сохранении "
-"важных файлов на портативный носитель данных."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Включить гостевой аккаунт</guilabel>: с помощью этого пункта можно "
-"включить или отключить гостевой аккаунт. Пользователь гостевого аккаунта "
-"сможет войти в систему, пользоваться компьютером, но будет иметь "
-"ограниченные права доступа даже по сравнению с обычными пользователями."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Командная оболочка</guilabel>: с помощью этого раскрывающегося "
 "списка вы можете изменить командную оболочку, которая будет использоваться "
 "для работы пользователя. Возможны следующие варианты: Bash, Dash и Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Код пользователя</guilabel>: здесь вы можете установить код "
 "(идентификатор) пользователя, имя которого было добавлено с помощью "
@@ -411,19 +401,14 @@ msgstr ""
 "если вам неизвестны последствия ваших действий."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Код группы</guilabel>: здесь вы можете установить код "
-"(идентификатор) группы пользователя. Следует указать номер, обычно тот же, "
-"что и для учетной записи пользователя. Не заполняйте это поле, если вам "
-"неизвестны последствия ваших действий."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Выберете точки монтированния"
 
@@ -440,13 +425,14 @@ msgstr "Выберете точки монтированния"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -456,7 +442,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -467,41 +453,45 @@ msgstr ""
 "application>, вы можете заменить точки монтирования."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "В случае внесения изменений не забудьте, что среди разделов обязательно "
 "должен быть корневой раздел <literal>/</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Для каждого из разделов будут показаны такие данные: "
 "«Устройство» («Ёмкость», «Точка монтированния», «Тип»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"Для пункта «Устройство» будет показано следующее: «жесткий диск», [«номер "
-"жесткого диска» (буква)], «номер раздела» (например, «sda5»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Если в системе много разделов, с помощью выпадающего меню вы сможете выбрать "
 "для них разные точки монтирования, в частности такие: <literal>/</literal>, "
@@ -512,20 +502,22 @@ msgstr ""
 "версии (cauldron)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Для разделов, доступ к которым в установленной системе не будет "
 "осуществляться, вы можете не указывать точку монтирования."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Нажмите кнопку <guibutton>Назад</guibutton>, если вы не уверены с выбором. "
 "Нажмите кнопку <guilabel>Специальное разбиение диска</guilabel>. В окне, "
@@ -533,7 +525,7 @@ msgstr ""
 "просмотреть данные по типу и размеру раздела."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -802,8 +794,9 @@ msgstr "Выбор рабочего стола"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "В зависимости от выбранного вами с помощью этой страницы варианта установки, "
@@ -812,8 +805,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -831,14 +825,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Выберите желаемую для вас графическую среду, <application>KDE</application> "
 "или <application>Gnome</application>. Эти среды объединяют полноценные "
@@ -866,8 +862,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -879,32 +876,37 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Рабочая станция."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Сервер."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Графическая среда."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Индивидуальный выбор пакетов: этот вариант можно использовать для добавления "
 "или удаления пакетов вручную."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Ознакомьтесь с разделом <xref linkend=\"minimal-install\"/>, где изложены "
@@ -912,31 +914,33 @@ msgstr ""
 "сервером и IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Выбор индивидуальных пакетов"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "С помощью этого варианта можно выбрать дополнительные пакеты, которые "
 "дополнят установленную вами систему, или удалить пакеты, являющиеся частью "
 "типового набора."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -951,47 +955,45 @@ msgstr ""
 "нажать эту кнопку еще раз при установке и загрузить сохраненный файл."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Настройка ваших служб"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "С помощью этой страницы вы можете определить, какие службы будут "
 "запускаться, а какие нет, при загрузке вашей системы."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Предусмотрено четыре группы служб. Чтобы развернуть список каждой из групп, "
-"нажмите кнопку с изображением треугольника перед пунктом группы."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Обычно необходимости в изменении настроек, выбранных DrakX, нет."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -1000,7 +1002,7 @@ msgstr ""
 "службе на панели под списком."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Вносите изменения только если вам хорошо известны последствия ваших действий."
@@ -1014,12 +1016,13 @@ msgstr "Настройка часового пояса"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1029,9 +1032,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Выберите ваш часовой пояс. Для этого достаточно выбрать вашу страну или "
 "какой-то город рядом с вашим местом пребывания так, чтобы этот город был "
@@ -1039,9 +1043,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "С помощью следующего раздела вы можете указать режим работы системных часов "
 "компьютера: использование местного времени или времени по Гринвичу (GMT), "
@@ -1058,23 +1063,23 @@ msgstr ""
 "GMT)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Выбор графического сервера (настройки вашей графической карты)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1083,7 +1088,7 @@ msgstr ""
 "программа может правильно определить ваш видеоадаптер."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1093,37 +1098,30 @@ msgstr ""
 "иерархического списка по следующим критериям:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "разработчик"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "название вашей карты"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "тип вашей карты"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Если вашей карты нет в списке карт по производителям (поскольку она еще не "
-"успела попасть в базы данных или слишком старая), вы можете найти "
-"соответствующий драйвер в категории «Xorg»."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "В категории «Xorg» вы можете воспользоваться одним из более 40 типовых "
 "драйверов с открытым кодом для видеокарт. Если вам все же не удастся найти "
@@ -1131,63 +1129,67 @@ msgstr ""
 "драйвер обеспечивает базовые возможности видео."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Будьте внимательны: если драйвер будет выбран ошибочно, вы сможете получить "
 "доступ только к интерфейсу командной строки."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Некоторые производители видеокарт сами создают проприетарные (закрытые) "
 "драйверы для Linux. Доступ к таким драйверов можно получить только с помощью "
 "репозиториев пакетов «Nonfree» или на сайтах производителей карт."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Вам следует явным образом включить репозитории «Nonfree», чтобы иметь к ним "
 "доступ. Сделать это можно и позднее - после первой перезагрузки системы."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Безразлично, какая графическая среда (или рабочая среда) была выбрана во "
 "время установки <application>Mageia</application>, все эти среды основаны на "
@@ -1201,7 +1203,7 @@ msgstr ""
 "является ошибочным."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1210,13 +1212,14 @@ msgstr ""
 "выберите установленную на компьютере графическую карту из списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Монитор</guibutton></emphasis>: вы можете выбрать "
 "<guilabel>Plug'n Play</guilabel> если считаете, что это правильно, или "
@@ -1226,32 +1229,33 @@ msgstr ""
 "вертикали и горизонтали для вашего монитора."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 "Ошибочно указанные частоты обновления изображения могут привести к "
 "повреждению монитора."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Разрешение</guibutton></emphasis>: с помощью этого "
 "пункта можно выбрать желаемое разрешение и глубину цвета на вашем мониторе."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Проверить</guibutton></emphasis>: кнопка проверки при "
 "установке недоступна. Если кнопка доступна, посредством ее нажатия вы можете "
@@ -1264,7 +1268,7 @@ msgstr ""
 "параметры были безопасными.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1273,12 +1277,12 @@ msgstr ""
 "пункта вы можете включить или отключить различные параметры."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Выбор монитора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1287,12 +1291,13 @@ msgstr ""
 "может правильно определить ваш монитор."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Выбор пункта монитора с другими аппаратными характеристиками может "
 "привести к повреждению монитора или видеоаппаратуры. Пожалуйста, подумайте "
@@ -1300,23 +1305,23 @@ msgstr ""
 "документации вашего монитора."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Дополнительно</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1330,7 +1335,7 @@ msgstr ""
 "будут показаны линии изображения."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1343,12 +1348,12 @@ msgstr ""
 "с документацией к вашему монитору."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1357,12 +1362,12 @@ msgstr ""
 "базе данных мониторов."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Производитель</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1372,28 +1377,30 @@ msgstr ""
 "списка по следующим критериям:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "название фирмы-производителя монитора"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "описание монитора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Общий</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "Если вы выберете эту группу, будет открыт список из около 30 типовых "
 "настроек дисплеев, подобных 1024x768@60 Гц, в который включены параметры "
@@ -1403,12 +1410,12 @@ msgstr ""
 "автоматически. Опять же, стоит параметры выбирать очень осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1419,12 +1426,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Если на вашем разделе <literal>/</literal> вы хотите воспользоваться "
 "шифрованием, то каталог <literal>/boot</literal> следует хранить на "
@@ -1432,11 +1441,12 @@ msgstr ""
 "иначе загрузка системы станет невозможной."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "С помощью этой страницы можно определить компоновку разделов(ла) в вашей "
 "системе. С ее помощью можно извлекать и создавать разделы, менять файловые "
@@ -1444,32 +1454,32 @@ msgstr ""
 "разделов до внесения изменений."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Для каждого обнаруженного жесткого диска или другого носителя данных (в "
-"частности флэш USB) будет отведена своя вкладка. Пример: sda, sdb и sdc, "
-"если будет обнаружено три диска."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Нажмите кнопку <guibutton>Очистить все</guibutton>, чтобы все разделы на "
 "выбранном носителе данных были очищены."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Чтобы выполнить любое другое действие, сначала обозначьте область "
 "соответствующего раздела. Затем посмотрите данные по разделу, измените его "
@@ -1480,35 +1490,37 @@ msgstr ""
 "раздела."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 "Повторяйте эти действия для всех соответствующих разделов, пока все не "
 "станет так, как вы хотите."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
 "завершены."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Если вы устанавливаете Mageia в систему с UEFI, убедитесь, что существует "
 "ESP (EFI System Partition) и смонтирована в /boot/EFI (см. Ниже)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1516,12 +1528,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1530,7 +1542,7 @@ msgstr ""
 "существует раздел BIOS надлежащего типа."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1543,32 +1555,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Разбиение на разделы"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "С помощью этой страницы вы можете просмотреть содержимое всех дисков "
 "компьютера и ознакомиться с предложениями мастера разбиения на разделы DrakX "
 "о месте установки <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Перечень пунктов в приведённом ниже списке зависит от комплектации "
 "компьютера и содержимого дисков."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1581,12 +1595,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Использовать существующие разделы"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1596,12 +1610,12 @@ msgstr ""
 "системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Использовать свободное место"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1610,12 +1624,12 @@ msgstr ""
 "свободное место, достаточное для установки новой системы Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Использовать свободное место на разделе Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1624,7 +1638,7 @@ msgstr ""
 "Windows достаточно свободного места для установки новой операционной системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1635,7 +1649,7 @@ msgstr ""
 "предварительно создать резервные копии важных для вас файлов!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1653,12 +1667,14 @@ msgstr ""
 "создать резервные копии важных для вас файлов."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Если будет выбран этот вариант, средство установки покажет остальные раздела "
 "Windows голубым цветом, а будущий раздел с Mageia - темно-синим. Размеры "
@@ -1667,39 +1683,41 @@ msgstr ""
 "ниже снимок экрана."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Стереть и использовать весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr ""
 "При использовании этого варианта для установки Mageia будет использован весь "
 "диск."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Замечание: все данные на диске будут в таком случае уничтожены. Будьте "
 "осторожны!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1710,12 +1728,12 @@ msgstr ""
 "вариантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Ручная разметка диска"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1724,67 +1742,80 @@ msgstr ""
 "разделов на вашем диске в соответствии с вашими предпочтениями."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Программа установки разделит свободное место в соответствии со следующими "
-"правилами:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Если общее доступное место меньше, чем 50 Гб, то будет создан только один "
 "раздел для / без отдельного раздела для /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "Если общее доступное место более, чем 50 Гб, то создаются три раздела"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 от общего доступного пространства выделяется под / с максимумом 50 Гб"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 выделяется под своп с максимумом 4 Гб"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "остальное (по крайней мере 12/19) выделяется под /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Это означает, что из 160 Гб и более свободного места программа установки "
 "создаст три раздела: 50 Гб для /, 4 ГБ для свопа, а остальное для /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Если вы пользуетесь системой с UEFI, ESP (раздел с системой EFI) будет "
 "обнаружен автоматически или создан, если его ещё не существовало, и "
@@ -1793,13 +1824,14 @@ msgstr ""
 "образом."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Если вы пользуетесь устаревшей системой (известной как CSM или BIOS) с "
 "диском GPT, вам придётся создать раздел для загрузки BIOS, если он ещё не "
@@ -1810,7 +1842,7 @@ msgstr ""
 "файловой системы «Раздел загрузки BIOS»."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1821,7 +1853,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1830,15 +1862,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "В некоторых новых дисках используются логические сектора в 4096 байт вместо "
 "предыдущего стандарта в 512 байт на логический сектор. Так как у "
@@ -1849,19 +1882,22 @@ msgstr ""
 "gparted с такими параметрами:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "«Выровнять по» «МиБ»"
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "«Свободное место до (МиБ)» «2»"
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
 
 #. type: Content of: <article><info><title>
@@ -1870,7 +1906,7 @@ msgid "Installation from LIVE medium"
 msgstr "Установка с LIVE носителя"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1885,17 +1921,17 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Официальная документация для Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1908,7 +1944,7 @@ msgstr ""
 "licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1920,7 +1956,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1933,13 +1969,13 @@ msgstr ""
 "улучшить данное руководство."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1951,26 +1987,33 @@ msgstr ""
 "выбранного вами варианта установки."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Установка с помощью DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Февраль 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1978,7 +2021,7 @@ msgstr "Поздравляем"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1987,7 +2030,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1997,17 +2040,18 @@ msgstr ""
 "извлекать носитель для установки системы и перезагружать компьютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "После перезагрузки с помощью экрана загрузки вы сможете выбрать одну из "
 "операционных систем, установленных на вашем компьютере (если установлено "
 "несколько систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2016,12 +2060,12 @@ msgstr ""
 "запустится установленная вами операционная система Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Приятной работы!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2036,11 +2080,12 @@ msgstr "Файервол"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "С помощью этого раздела вы можете настроить простые правила работы защитного "
 "шлюза (брандмауэра): они определяют тип сообщения из интернета, которое "
@@ -2049,15 +2094,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "В обычном состоянии ни один из пунктов не обозначен - ни одна из служб в "
 "системе не будет доступна из интернета. Пункт <emphasis>Все (защитного шлюза "
@@ -2070,10 +2116,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Назначение всех пунктов должно быть более-менее понятным. Например, выберите "
 "«Сервер CUPS», если хотите, чтобы принтеры на вашем компьютере были доступны "
@@ -2086,12 +2133,11 @@ msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "В списке пунктов содержатся только самые распространенные типы служб. С "
 "помощью кнопки «Дополнительно» можно открыть страницу определения службы, "
@@ -2100,12 +2146,12 @@ msgstr ""
 "пробелами)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;номер порта>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2116,7 +2162,7 @@ msgstr ""
 "RSYNC). Номер определяется по протоколу <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2126,7 +2172,7 @@ msgstr ""
 "использоваться для обмена данными со службой."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2135,7 +2181,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2144,7 +2190,7 @@ msgstr ""
 "указать две пары записей для одного порта."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Форматирование"
 
@@ -2153,14 +2199,14 @@ msgstr "Форматирование"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2170,23 +2216,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "С помощью этой страницы вы можете определиться с тем, какие разделы следует "
 "форматировать. Все данные на разделах, которые <emphasis>не</emphasis> "
 "отмечены для форматирования, будут сохранены."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Обычно форматирование нужно по крайней мере для разделов, выбранных DrakX."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2196,12 +2243,13 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Если вы не уверены в правильности своего выбора, вы можете нажать кнопку "
 "<guibutton>Назад</guibutton>, еще раз <guibutton>Назад</guibutton>, а потом "
@@ -2209,7 +2257,7 @@ msgstr ""
 "С помощью основной страницы можно просмотреть текущие параметры разделов."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2218,12 +2266,12 @@ msgstr ""
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, программа для установки Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2234,7 +2282,7 @@ msgstr ""
 "системы прошло как можно проще для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2244,37 +2292,41 @@ msgstr ""
 "именно тот пункт, который вам нужен."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Приветственное окно программы установки"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "С помощью DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Ниже приведены окна приветствия DVD Mageia по умолчанию. Первое из них "
 "соответствует системе с UEFI, второе - системе с устаревшей системой "
 "загрузки:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "С этой страницы вы можете получить доступ к параметрам, нажав клавишу «e» "
 "для перехода в режим редактирования. Чтобы вернуться из этого режима, "
@@ -2283,121 +2335,113 @@ msgstr ""
 "редактирования."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "С помощью этой страницы можно указать некоторые личные предпочтения:"
+#: 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:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Язык (на время установки, в системе может быть выбран совсем другой язык) "
-"можно выбрать после нажатия клавиши F2 (только в устаревшем режиме)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке, и "
 "нажмите клавишу Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Ниже приведён пример окна приветствия в Live DVD/CD. Заметьте, что в меню "
-"Live DVD/CD нет таких пунктов: <guilabel>Восстановление системы</guilabel>, "
-"<guilabel>Тест памяти</guilabel> и <guilabel>Инструмент поиска оборудования</"
-"guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Изменить разрешение экрана можно с помощью нажатия клавиши F3 (только в "
 "устаревшем режиме)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Добавить параметры работы ядра можно нажатием клавиши  <emphasis role=\"bold"
-"\">F6</emphasis> в режиме устаревшей системы или клавиши  <emphasis role="
-"\"bold\">e</emphasis> в режиме UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Default (по умолчанию), не менять ничего в параметрах по умолчанию."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Если программе установки не удаётся выполнить свое назначение должным "
-"образом, вы можете повторить попытку, воспользовавшись дополнительными "
-"возможностями. В меню, которое можно вызвать нажатием клавиши F6, будет "
-"показан новый пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметры "
-"загрузки</guilabel>) с такими четырьмя подпунктами:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Default (по умолчанию), не менять ничего в параметрах по умолчанию."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (без расширенного интерфейса настройки и управления питанием), не "
 "принимать во внимание параметры управления питанием."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- No Local APIC (без локального расширенного контроллера прерываний с "
 "возможностью программирования), этот вариант связан с прерываниями работы "
 "центрального процессора, выберите его, если есть соответствующие установки."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2406,36 +2450,32 @@ msgstr ""
 "умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "В некоторых релизах Mageia параметры, выбранные с помощью F6, не появляются "
 "в строке <guilabel>Параметры загрузки</guilabel>. Однако, эти параметры "
 "будут учтены при загрузке."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Дополнительные параметры работы ядра можно указать после нажатия клавиши F1 "
-"(только в устаревшем режиме)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Нажатие клавиши F1 открывает новое окно со списком пунктов. Выберите один из "
 "пунктов с помощью клавиш со стрелками и нажмите клавишу Enter, чтобы "
@@ -2443,19 +2483,20 @@ msgstr ""
 "приветствия."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Ниже приведён снимок окна с подробным описанием параметров окна приветствия "
 "системы. Нажмите клавишу Esc или выберите <guilabel>Return to Boot Options</"
@@ -2464,21 +2505,24 @@ msgstr ""
 "<guilabel>Параметры загрузки</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
 "клавиши F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2488,62 +2532,27 @@ msgstr ""
 "можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options\">здесь</link>."
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "С помощью проводной сети"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Ниже приведено окно приветствия по умолчанию образа для установки по "
-"проводной сети (образ netinstall.iso или netinstall-nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Здесь нельзя изменить язык. Список доступных параметров приведён на экране. "
-"Подробное описание использования образа для установки по сети приведено в "
-"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Вики Mageia</"
-"link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Раскладка клавиатуры соответствует американскому английскому."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Шаги установки"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Установка разделена на последовательность шагов, перечень которых будет "
 "показан на боковой панели экрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "На каждом шаге вам будут показаны одна или несколько страниц, на которых вы "
 "можете увидеть кнопку <guibutton>Дополнительно</guibutton>. С помощью этой "
@@ -2551,20 +2560,22 @@ msgstr ""
 "пользуются не так часто, как основными."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "На большинстве страниц вы также увидите кнопку <guibutton>Справка</"
 "guibutton>, с помощью которой можно получить дополнительные объяснения "
 "относительно текущего шага."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2583,17 +2594,17 @@ msgstr ""
 "Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблемы с установкой и возможные пути их решения"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Нет графического интерфейса"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2605,13 +2616,16 @@ msgstr ""
 "впишите <code>vgalo</code> в строку запроса."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Если компьютер является очень старым, то установка в графическом режиме "
 "может быть просто невозможна. В таком случае стоит воспользоваться текстовым "
@@ -2621,12 +2635,12 @@ msgstr ""
 "и нажмите клавишу Enter. Установка будет продолжена в текстовом режиме."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Остановка установки"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2642,14 +2656,15 @@ msgstr ""
 "При необходимости эту команду можно совместить с вышеуказанными командами."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Проблемы с RAM (оперативной памятью)"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2662,18 +2677,20 @@ msgstr ""
 "оперативной памяти."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Динамические разделы"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Если Вы преобразовали свой диск из \"базового\" формата в \"динамический\" "
 "формат Microsoft Windows, то Вы должны знать, что невозможно установить "
@@ -2691,18 +2708,18 @@ msgstr "Обновления"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2711,10 +2728,11 @@ msgstr ""
 "пакеты могли быть обновлены или улучшены."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Нажмите кнопку <guilabel>Да</guilabel>, если вы хотите получить и установить "
@@ -2722,8 +2740,9 @@ msgstr ""
 "этого сейчас или ваш компьютер не подключен к интернету."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr ""
 "Как только выбор будет сделан, нажмите кнопку <guibutton>Далее</guibutton>, "
 "чтобы продолжить работу с программой."
@@ -2783,18 +2802,18 @@ msgstr "Выбор источника (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2807,7 +2826,7 @@ msgstr ""
 "пакетов будут доступны для выбора на последующих шагах."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2816,7 +2835,7 @@ msgstr ""
 "содержатся основные пакеты дистрибутива."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2831,13 +2850,14 @@ msgstr ""
 "графическим картам nVidia и ATI, прошивки для различных карт WiFi и т. п."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "В репозитории <emphasis>Tainted</emphasis> хранятся пакеты, выпущенные в "
 "соответствии со свободными лицензионными соглашениями. Основным критерием "
@@ -2849,38 +2869,41 @@ msgstr ""
 "и т. п."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Минимальная установка"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Вы можете выбрать «Минимальная установка» снятием отметок по всем пунктам в "
 "списке выбора групп пакетов, см. раздел <xref linkend=\"choosePackageGroups"
 "\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Если нужно, вы можете выбрать дополнительно опцию «Индивидуальный выбор "
 "пакетов» на той же странице."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Минимальный режим предназначен для тех, кто намерен использовать "
 "<application>Mageia</application> с какой то узкоспециализированной целью, в "
@@ -2890,9 +2913,10 @@ msgstr ""
 "пакетов см. <xref linkend=\"choosePackagesTree\"> </xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Если вы выберете этот вариант установки, на следующей странице программы вам "
@@ -2900,16 +2924,14 @@ msgstr ""
 "документацию и графический сервер."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"При выборе, в категории «Вместе с X» будет также пункт IceWM, легковесная "
-"рабочая среда."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2924,15 +2946,15 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2949,11 +2971,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX пытается правильно определить настройки вашей системы согласно "
 "сделанного вами выбора и выявленного через DrakX оборудования. Вы можете "
@@ -2962,9 +2985,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Как правило, рекомендованным является использование параметров по умолчанию. "
 "Вы можете ничего не менять, кроме трёх исключений:"
@@ -2981,76 +3005,80 @@ msgstr "вы попытались с параметрами по умолчан�
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 "в разделах с подробной информацией, приведённых ниже, утверждается, что "
 "следует выбрать параметры не по умолчанию."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Параметры системы"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Часовой пояс</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX выбирает часовой пояс на основе указанного вами желаемого языка. При "
 "необходимости вы можете изменить часовой пояс. См. также <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Страна / Регион</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Если вы находитесь не в той стране, которая была выбрана автоматически, "
 "очень важно исправить значение этого параметра. См. <xref linkend="
 "\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Загрузчик</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX автоматически выбирает соответствующие параметры загрузчика."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr ""
 "Не вносите никаких изменений, если вы не являетесь знатоком настройки Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Управление учетными записями</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3059,22 +3087,23 @@ msgstr ""
 "каждого пользователя будет свой ​​каталог <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Службы</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Системными службами называются те небольшие программы, которые работают в "
 "фоновом режиме (фоновые службы). С помощью этого инструмента вы сможете "
 "включить или отключить некоторые из этих служб."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3083,34 +3112,35 @@ msgstr ""
 "работы компьютера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureServices"
 "\"/>."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Параметры оборудования"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Клавиатура</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "С помощью этого раздела можно настроить или изменить раскладку клавиатуры, "
 "параметры которой будут зависеть от места вашего расположения, языка и типа "
 "клавиатуры."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3120,12 +3150,12 @@ msgstr ""
 "текст вашего пароля."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Мышь</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3134,16 +3164,17 @@ msgstr ""
 "шаровые манипуляторы и т.д."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Звуковая плата</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Инсталлятор использует драйвер по умолчанию, если он всего один и при этом "
 "дефолтный. Опция выбора другого драйвера предоставлена только когда у вас "
@@ -3151,26 +3182,26 @@ msgstr ""
 "дефолтным."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Графический интерфейс</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "С помощью этого раздела вы можете настроить параметры работы ваших "
 "графических карт и дисплеев."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureX_chooser"
 "\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3179,20 +3210,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Параметры сети и Интернета"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Сеть</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3203,21 +3235,22 @@ msgstr ""
 "это на предыдущем шаге."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "При добавлении сетевой карты не забудьте вместе с ней настроить брандмауэр "
 "(сетевой экран), который будет следить за соответствующим интерфейсом."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Прокси</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3228,26 +3261,27 @@ msgstr ""
 "прокси-сервера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Вам стоит посоветоваться с вашим системным администратором, чтобы узнать "
 "больше о значении параметров, которые следует указать в этом разделе."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Безопасность"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Уровень безопасности</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3257,19 +3291,19 @@ msgstr ""
 "компьютеру достаточную защиту."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 "Выберите тот из вариантов, который лучше всего соответствует вашему образу "
 "использования системы."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Файервол</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3279,7 +3313,7 @@ msgstr ""
 "воспользоваться этими данными."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3291,7 +3325,7 @@ msgstr ""
 ">."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Помните, что включение доступа без ограничений (выключение файервола) может "
@@ -3313,8 +3347,8 @@ msgstr ""
 "После установки загрузчика программа попросит вас прервать работу системы, "
 "вынуть из лотка компакт-диск, отсоединить от компьютера флешку и "
 "перезагрузить компьютер. Нажмите кнопку <emphasis role=\"bold"
-"\"><guibutton>Завершить</guibutton></emphasis> и выполните именно эти действия "
-"<emphasis role=\"bold\"> в указанном порядке </emphasis>."
+"\"><guibutton>Завершить</guibutton></emphasis> и выполните именно эти "
+"действия <emphasis role=\"bold\"> в указанном порядке </emphasis>."
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:11
@@ -3364,42 +3398,73 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Уровень безопасности"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role = \"bold\">Размер раздела:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Дополнительно</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"С помощью этой страницы вы можете изменить уровень защиты вашей системы."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Если вы не уверены в нужных для вас параметрах, лучше не меняйте их "
-"дефолтные значения."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "После установки вы всегда сможете изменить параметры защиты с помощью модуля "
 "<guilabel>Безопасность</guilabel> в Центре управления Mageia."
@@ -3416,25 +3481,27 @@ msgstr "Введение"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia распространяется через образы ISO. Эта страница поможет вам выбрать, "
 "какие образы соответствуют вашим потребностям."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Существует два семейства источников:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Классическая программа установки: После загрузки с носителя будет "
 "возможность следить за процессом, позволяя выбрать что установить и как "
@@ -3443,82 +3510,86 @@ msgstr ""
 "которое вы будете устанавливать."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE носитель: вы можете загрузиться с носителя в реальной системе Mageia, "
-"не устанавливая её, чтобы увидеть, что вы получите после установки. Процесс "
-"установки проще, но вы получите меньший выбор."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Подробности приведены в следующих разделах."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Носитель"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Определение"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Здесь мы называем носителем данных файл образа ISO, с помощью которого можно "
 "установить и/или обновить Mageia, а также любой физический носитель, на "
 "котором хранятся данные файла ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Вы можете найти их <link ns4:href=\"http://www.mageia.org/ru/downloads/"
 "\">здесь</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Классический носитель для установки"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Типичные возможности"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Эти ISO используют традиционный инсталлятор, называемый drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Они пригодны для установки «с нуля» или для обновления предыдущих выпусков."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Различные носители для архитектур 32 или 64 бит."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3527,12 +3598,12 @@ msgstr ""
 "система восстановления, тест памяти, инструмент обнаружения оборудования."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Каждый DVD содержит многие доступные рабочие среды и языки."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3540,100 +3611,105 @@ msgstr ""
 "программного обеспечения."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live носитель"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Можно воспользоваться для ознакомления с дистрибутивом без установки его на "
 "жёсткий диск и опционально установить Mageia на ваш жёсткий диск."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "Каждый ISO содержит лишь одну рабочую среду (Plasma, GNOME или Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live образами ISO можно пользоваться только для "
 "установки системы «с нуля». Они непригодны для обновления системы с "
 "предыдущих выпусков.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Они содержат несвободное программное обеспечение."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Только рабочая среда Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Присутствуют все языки."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Только для 64-битной архитектуры."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Только рабочая среда GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Только для 64-битной архитектуры"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Только рабочая среда Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32-битная и 64-битная архитектуры."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Носители CD только для загрузки"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3645,11 +3721,12 @@ msgstr ""
 "или в интернете."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Такие носители очень маленькие (менее 100 МБ). Ими удобно пользоваться, если "
 "канал связи в сети слишком узкий для загрузки полноценного образа DVD, на "
@@ -3657,17 +3734,18 @@ msgstr ""
 "систему с флэш-диска USB."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Только английский язык."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3701,11 +3779,12 @@ msgstr "Загрузка"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Как только вами будет выбран нужный вам файл ISO, вы можете получить его или "
 "с помощью протокола http, или с помощью BitTorrent. В обоих случаях в окне "
@@ -3720,10 +3799,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum и sha1sum - программы для проверки целостности данных в образах ISO. "
 "Для выполнения проверки достаточно установить только одну из этих программ. "
@@ -3737,8 +3817,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Отметьте пункт «Сохранить файл»."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3746,14 +3826,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Проверка целостности полученных данных образа"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Оба шестнадцатеричных числа вычислены с помощью определённого алгоритма на "
 "основе файла, который должен быть получен. Если вы попросите соответствующую "
@@ -3764,70 +3845,85 @@ msgstr ""
 "получение образа или попытаться восстановить его с помощью BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr ""
 "Откройте консоль (от имени обычного пользователя) и дайте следующую команду:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- При использовании md5sum: [sam@localhost]$ <userinput>md5sum путь/до/файла/"
 "образа/file.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- При использовании sha1sum: [sam@localhost]$ <userinput>sha1sum путь/до/"
 "файла/образа/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"и сравните полученное числовое значение (для его получения потребуется "
-"определённое время) с числом, указанным на странице Mageia. Пример:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"и сравните полученное числовое значение (для его получения потребуется "
+"определённое время) с числом, указанным на странице Mageia. Пример:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Запись образа ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Проверенный образ ISO можно записать на компакт-диск, DVD или флешку USB. "
 "Действие записи не является простым копированием, - она предназначена для "
 "создания загрузочного носителя."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Записать ISO на CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Воспользуйтесь любым устройством для записи, но его необходимо настроить на "
 "<emphasis role=\"bold\">запись образа</emphasis>. Просто записать данные или "
@@ -3835,12 +3931,12 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">вики Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Запись образа ISO на USB флешку"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3849,18 +3945,19 @@ msgstr ""
 "USB флешку и пользоваться ею для загрузки и установки системы."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "В результате «записи» образа на диск USB (флешку) все данные файловой "
 "системы на ней будут уничтожены. Доступ ко всем данным, которые не будут "
 "уничтожены, будут потеряны. Размер диска будет уменьшен на размер образа."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3869,12 +3966,12 @@ msgstr ""
 "придётся его форматировать."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Использование графического инструмента внутри Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3884,73 +3981,72 @@ msgstr ""
 "IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Использование графического инструмента внутри Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Вы можете попробовать:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "использует опцию \"образа ISO\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Использование командной строки внутри системы GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Это потенциально *опасно* делать это вручную. Вы рискуете перезаписать "
 "раздел диска, если вы неправильно получите идентификатор устройства."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Вы также можете воспользоваться консольной программой dd:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Откройте окно консоли"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Получите права пользователя root с помощью команды <userinput>su -</"
 "userinput> (не забудьте «-» в конце команды)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3960,28 +4056,41 @@ msgstr ""
 "файлами)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Введите команду <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Найдите имя устройства для вашего USB диска (по его размеру). Например, на "
+"приведенном выше снимке <code>/dev/sdb</code> - это устройство ёмкостью 8 "
+"ГБ, это флешка USB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "В качестве альтернативы вы можете получить имя устройства с помощью команды "
 "<code>dmesg</code>: в конце вы увидите имя устройства, начинающегося с "
 "<emphasis>sd</emphasis>, и<emphasis>sdd</emphasis> в этом случае:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4023,47 +4132,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Найдите имя устройства для вашего USB диска (по его размеру). Например, на "
-"приведенном выше снимке <code>/dev/sdb</code> - это устройство ёмкостью 8 "
-"ГБ, это флешка USB."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Введите команду: # <userinput>dd if=путь/до/файла/образа/file of=/dev/sdX "
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Где X=имя вашего устройства, например: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Например: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Введите команду: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Извлеките флешку USB. Запись завершена."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4094,19 +4211,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Если вашей страны нет в списке, нажмите кнопку <guilabel>Другие страны</"
 "guilabel> и выберите страну или регион в окне, которое будет открыто."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Если пункт вашей страны есть только в списке <guilabel>Другие страны</"
@@ -4115,18 +4234,19 @@ msgstr ""
 "выбор."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Способ ввода"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "С помощью окна <guilabel>Другие страны</guilabel> вы можете выбрать способ "
@@ -4140,11 +4260,13 @@ msgstr ""
 "FTP."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Если способ ввода нужен вам после установки системы, вы можете получить "
 "доступ к нему после загрузки установленной системы с помощью пункта меню "
@@ -4152,56 +4274,54 @@ msgstr ""
 "пользователя root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Установка или обновление"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Установка"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Этим вариантом следует воспользоваться, если вы хотите установить "
-"<application>Mageia</application> с нуля."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Обновление"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Если на компьютере установлена ​​одна или несколько предыдущих версий "
-"<application>Mageia</application>, то программа установки предоставит вам "
-"возможность обновить одну из установленных систем до последней версии."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Было тщательно проверено только обновление с предыдущей версии Mageia, "
 "которая <emphasis>всё ещё поддерживалась</emphasis>, когда эта версия "
@@ -4210,16 +4330,17 @@ msgstr ""
 "сохранив только раздел <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Если в течение процедуры установки вы решите прекратить установку, то вы "
 "можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
@@ -4232,12 +4353,14 @@ msgstr ""
 "Ctrl Delete</guilabel> одновременно, чтобы перезагрузить компьютер."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Если вы обнаружите, что забыли установить пакет дополнительного языка, вы "
 "можете вернуться со страницы «Установка или обновление» на страницу выбора "
@@ -4272,12 +4395,12 @@ msgstr ""
 "языка и часового пояса, выбранного ранее."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Клавиатура"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4287,16 +4410,17 @@ msgstr ""
 "будет использована типичная американская раскладка US."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4315,23 +4439,25 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Если нужного пункта для вашей клавиатуры не будет в показанном списке, "
 "нажмите кнопку <guibutton>Еще</guibutton> для ознакомления с полным списком, "
 "из которого вы можете выбрать модель клавиатуры."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "После выбора модели клавиатуры с помощью диалогового окна <guibutton>Еще</"
 "guibutton> вы вернетесь к первому диалоговому окну выбора клавиатуры, в "
@@ -4340,23 +4466,24 @@ msgstr ""
 "полного списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Если вами была выбрана раскладка с нелатинскими символами, программа покажет "
 "дополнительное диалоговое окно, с помощью которого вы сможете определиться "
 "со способом переключения между латинской и нелатинской раскладкой."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Выберите, пожалуйста, язык"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4367,7 +4494,7 @@ msgstr ""
 "использовать этот выбор во время установки и в установленной системе."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4377,12 +4504,13 @@ msgstr ""
 "системе."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Если в системе будет использоваться несколько языков (вами или другими "
 "пользователями), нажмите кнопку <guibutton>Несколько языков</guibutton>, "
@@ -4390,7 +4518,7 @@ msgstr ""
 "сложно."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4403,18 +4531,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Даже если вами было выбрано несколько языков, вам сначала необходимо выбрать "
 "один из них как основной язык страниц программы установки. Кроме того, этот "
 "язык будет отмечен и в окне выбора нескольких языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4424,23 +4553,24 @@ msgstr ""
 "связанные с выбранной раскладкой."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "По умолчанию Mageia использует поддержку UTF-8 (Юникод)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Кодировку можно отключить в окне выбора нескольких языков, если вам заранее "
 "известно, что Unicode несовместим с вашим языком. Выключение UTF-8 касается "
 "всех установленных языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4495,71 +4625,76 @@ msgstr ""
 "шестью или более кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 "Добавление пункта в меню загрузки или внесение изменений в такие пункты"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Для этого вам придётся внести вручную изменения в /boot/grub2/custom.cfg или "
 "воспользоваться программой для настройки GRUB (например grub-customizer из "
 "репозиториев Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Чтобы узнать больше, ознакомьтесь с соответствующей страницей нашей вики: "
 "<link ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://"
 "wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Интерфейс загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "По умолчанию Mageia эксклюзивно использует:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (с графическим меню или без него) для устаревших систем с MBR или GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi для системы UEFI."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Графические меню Mageia выглядят великолепно. :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 для устаревших систем с MBR и GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4572,29 +4707,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Не изменяйте \"Загрузочное устройство\", если на самом деле не знаете, что "
 "вы делаете."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi в системах UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Если вы пользуетесь системой с UEFI, интерфейс немного отличается, поскольку "
 "вы не сможете выбирать между загрузчиком с графическим меню и без него."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4607,14 +4747,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Если Mageia является единственной операционной системой, установленной на "
@@ -4627,36 +4768,41 @@ msgstr ""
 "установленных вами операционных систем."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Использование загрузчика Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "По умолчанию в зависимости от вашей системы, Mageia записывает новый:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "загрузчик GRUB2 или к MBR (Master Boot Record) вашего первого диска, или к "
 "загрузочному разделу BIOS."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "загрузчик Grub2-efi к ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Если на компьютере уже установлены другие операционные системы, Mageia "
 "попытается добавить эти системы к вашему новому меню загрузки Mageia. Если "
@@ -4664,7 +4810,7 @@ msgstr ""
 "флажок с пункта <guilabel>Зондирование посторонней ОС</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4677,18 +4823,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Использование уже установленного загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Полный перечень шагов добавления пункта ОС Mageia в меню уже установленного "
 "загрузчика не является предметом этой справочной страницы. Впрочем, в "
@@ -4698,16 +4845,17 @@ msgstr ""
 "другой операционной системы."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Использование цепной загрузки"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Если вы не хотите использовать загрузчик Mageia, а вместо этого хотите "
 "воспользоваться цепной загрузкой с другой операционной системы, нажмите "
@@ -4715,7 +4863,7 @@ msgstr ""
 "guibutton> и отметьте пункт <guilabel>не трогать ESP или MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4728,7 +4876,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4737,7 +4885,7 @@ msgstr ""
 "Проигнорируйте предупреждение и нажмите кнопку <guibutton>ОК</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4746,33 +4894,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Параметры"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Первая страница"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Пауза перед загрузкой основной системы</guilabel>: с помощью этого "
 "пункта можно установить задержку в секундах перед загрузкой операционной "
 "системы по умолчанию."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Безопасность</guilabel>: с помощью этого раздела вы можете "
 "установить пароль для доступа к загрузчику. Использование пароля будет "
@@ -4781,38 +4930,38 @@ msgstr ""
 "на следующем этапе."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Пароль</guilabel>: с помощью этого поля для ввода текста вы можете "
 "указать пароль."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Пароль (ещё раз)</guilabel>: повторите ввод пароля пользователя в "
 "этом поле. drakx проверит, совпадает ли введённый повторно пароль с его "
 "первоначальным вариантом."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Дополнительно</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Включить ACPI</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) является стандартом управления питанием компьютера. С его помощью "
@@ -4824,9 +4973,10 @@ msgstr ""
 "системы или «зависания» системы)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Включить SMP</guilabel>: с помощью этого пункта можно включить или "
@@ -4834,12 +4984,12 @@ msgstr ""
 "установлен многоядерный процессор."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Включить APIC</guilabel>: обозначение этого пункта предоставляет "
 "операционной системе доступ к расширенному программируемому контроллеру "
@@ -4848,29 +4998,30 @@ msgstr ""
 "процессов и управления расширенными IRQ (запросами в отношении прерываний)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Включить локальный APIC</guilabel>: с помощью этого пункта можно "
 "включить локальный APIC, то есть управление всеми внешними прерываниями для "
 "определённых процессоров в многопроцессорных системах."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Следующая страница"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>По умолчанию:</guilabel> вариант операционной системы для загрузки "
 "по умолчанию."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4880,7 +5031,7 @@ msgstr ""
 "предоставить вам больше информации во время загрузки системы."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4889,11 +5040,12 @@ msgstr ""
 "linkend=\"setupMageiaBootloader\">использование загрузчика Mageia</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Режим видео:</guilabel> с помощью этого пункта можно указать "
 "разрешения экрана (в пикселях) и глубину цветов для меню загрузки. Если вы "
@@ -4901,7 +5053,7 @@ msgstr ""
 "покажет варианты разрешений и глубины цветов, которыми можно воспользоваться."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4910,7 +5062,7 @@ msgstr ""
 "<link linkend=\"setupChainLoading\">использование цепной загрузки</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
@@ -4923,36 +5075,39 @@ msgstr "Настройка SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "Обычно DrakX определяет параметры дисков правильно. Впрочем, если вы имеете "
 "дело с устаревшим дисковым контроллером SCSI, возможны ошибки, из-за которых "
 "программа не сможет установить нужных драйверов."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Если вам встретился именно такой контроллер, вам придется вручную сообщить "
 "DrakX, с каким диском SCSI придется иметь дело."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "После этого, DrakX сможет настроить систему на работу с дисками должным "
@@ -4975,10 +5130,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "На этом экране указан драйвер, который инсталлятор выбрал для вашей звуковой "
 "карты из имеющихся и который будет драйвером по умолчанию, если имеется "
@@ -5001,10 +5156,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Затем в draksound или в окне утилиты \"Настройка звука\" щёлкните на "
 "<guibutton>Дополнительно</guibutton> и потом на <guibutton>Устранение "
@@ -5012,32 +5169,35 @@ msgstr ""
 "эту проблему."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Дополнительно"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Нажатие <guibutton>Дополнительно</guibutton> в этом окне во время установки "
 "полезно, если нет драйвера по умолчанию и есть несколько доступных "
 "драйверов, но вы считаете, что инсталлятор выбрал неверный драйвер."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "В этом случае вы можете выбрать другой драйвер после нажатия на "
 "<guibutton>Позволить мне выбрать любой драйвер</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Подтверждение форматирования жесткого диска"
 
@@ -5048,13 +5208,13 @@ msgstr "Подтверждение форматирования жесткого
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -5064,18 +5224,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Нажмите  кнопку <guibutton>Назад</guibutton>, если вы не уверены в сделанном "
 "выборе."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Нажмите кнопку <guibutton>Далее</guibutton>, если вы уверены и хотите "
 "стереть все разделы, все операционные системы на диске и все данные, "
@@ -5201,16 +5364,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Удаление Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Руководство"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Если Mageia не удовлетворяет вашим потребностям или вы не смогли должным "
@@ -5218,28 +5377,30 @@ msgstr ""
 "дистрибутива. Это ваше право, и в Mageia предусмотрена возможность удаления "
 "системы. Такую возможность можно найти не в каждой операционной системе."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "После создания резервной копии данных, перезагрузите систему с DVD Mageia и "
 "выберите пункт «Rescue system/Спасение системы», далее «Restore Windows boot "
 "loader/Восстановить загрузчик Windows». При следующей загрузке системы "
 "загрузится только Windows без всяких окон выбора операционной системы."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Чтобы воспользоваться местом на диске, которое некогда было занято разделами "
 "Mageia, в Windows, воспользуйтесь пунктом меню <code>Пуск -> Панель "
@@ -5251,8 +5412,8 @@ msgstr ""
 "выберите пункт <guibutton>Удалить</guibutton>. После этого место на диске "
 "будет освобождено."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5261,14 +5422,15 @@ msgstr ""
 "выполнить его форматирование (в FAT32 или NTFS). Система предоставит ему "
 "соответствующую букву диска."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Если на компьютере установлена Vista или 7, у вас будет еще один возможный "
 "вариант: вы можете расширить существующий раздел с помощью пункта, "
@@ -5323,3 +5485,341 @@ msgstr ""
 "Следующим шагом является копирование файлов на жёсткий диск. Это занимает "
 "несколько минут. В завершение вы получите пустой экран в течение некоторого "
 "времени, это нормально."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Пароль (еще раз)</guilabel>: повторите ввод пароля в этом поле. "
+#~ "DrakX проверит, совпадает ли  введенный повторно пароль с его "
+#~ "первоначальным вариантом."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Кроме того, вы можете отключить или включить учётную запись гостя."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Любые данные, которые будут записаны с гостевого аккаунта "
+#~ "<emphasis>rbash</emphasis> в соответствующий каталог в /home, будут "
+#~ "потеряны при выходе из системы. Пользователю гостевого аккаунта следует "
+#~ "позаботиться о сохранении важных файлов на портативный носитель данных."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Включить гостевой аккаунт</guilabel>: с помощью этого пункта "
+#~ "можно включить или отключить гостевой аккаунт. Пользователь гостевого "
+#~ "аккаунта сможет войти в систему, пользоваться компьютером, но будет иметь "
+#~ "ограниченные права доступа даже по сравнению с обычными пользователями."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Код группы</guilabel>: здесь вы можете установить код "
+#~ "(идентификатор) группы пользователя. Следует указать номер, обычно тот "
+#~ "же, что и для учетной записи пользователя. Не заполняйте это поле, если "
+#~ "вам неизвестны последствия ваших действий."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "Для пункта «Устройство» будет показано следующее: «жесткий диск», [«номер "
+#~ "жесткого диска» (буква)], «номер раздела» (например, «sda5»)."
+
+#~ msgid "Workstation."
+#~ msgstr "Рабочая станция."
+
+#~ msgid "Server."
+#~ msgstr "Сервер."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Графическая среда."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Предусмотрено четыре группы служб. Чтобы развернуть список каждой из "
+#~ "групп, нажмите кнопку с изображением треугольника перед пунктом группы."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Если вашей карты нет в списке карт по производителям (поскольку она еще "
+#~ "не успела попасть в базы данных или слишком старая), вы можете найти "
+#~ "соответствующий драйвер в категории «Xorg»."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Для каждого обнаруженного жесткого диска или другого носителя данных (в "
+#~ "частности флэш USB) будет отведена своя вкладка. Пример: sda, sdb и sdc, "
+#~ "если будет обнаружено три диска."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Программа установки разделит свободное место в соответствии со следующими "
+#~ "правилами:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "«Выровнять по» «МиБ»"
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "«Свободное место до (МиБ)» «2»"
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "С помощью этой страницы можно указать некоторые личные предпочтения:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Язык (на время установки, в системе может быть выбран совсем другой язык) "
+#~ "можно выбрать после нажатия клавиши F2 (только в устаревшем режиме)."
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Ниже приведён пример окна приветствия в Live DVD/CD. Заметьте, что в меню "
+#~ "Live DVD/CD нет таких пунктов: <guilabel>Восстановление системы</"
+#~ "guilabel>, <guilabel>Тест памяти</guilabel> и <guilabel>Инструмент поиска "
+#~ "оборудования</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Добавить параметры работы ядра можно нажатием клавиши  <emphasis role="
+#~ "\"bold\">F6</emphasis> в режиме устаревшей системы или клавиши  <emphasis "
+#~ "role=\"bold\">e</emphasis> в режиме UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Если программе установки не удаётся выполнить свое назначение должным "
+#~ "образом, вы можете повторить попытку, воспользовавшись дополнительными "
+#~ "возможностями. В меню, которое можно вызвать нажатием клавиши F6, будет "
+#~ "показан новый пункт, <guilabel>Boot options</guilabel> "
+#~ "(<guilabel>Параметры загрузки</guilabel>) с такими четырьмя подпунктами:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Дополнительные параметры работы ядра можно указать после нажатия клавиши "
+#~ "F1 (только в устаревшем режиме)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "С помощью проводной сети"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Ниже приведено окно приветствия по умолчанию образа для установки по "
+#~ "проводной сети (образ netinstall.iso или netinstall-nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Здесь нельзя изменить язык. Список доступных параметров приведён на "
+#~ "экране. Подробное описание использования образа для установки по сети "
+#~ "приведено в <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
+#~ "\">Вики Mageia</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Раскладка клавиатуры соответствует американскому английскому."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "При выборе, в категории «Вместе с X» будет также пункт IceWM, легковесная "
+#~ "рабочая среда."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr ""
+#~ "С помощью этой страницы вы можете изменить уровень защиты вашей системы."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Если вы не уверены в нужных для вас параметрах, лучше не меняйте их "
+#~ "дефолтные значения."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE носитель: вы можете загрузиться с носителя в реальной системе "
+#~ "Mageia, не устанавливая её, чтобы увидеть, что вы получите после "
+#~ "установки. Процесс установки проще, но вы получите меньший выбор."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Носители CD только для загрузки"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Отметьте пункт «Сохранить файл»."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Вы также можете воспользоваться консольной программой dd:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Извлеките флешку USB. Запись завершена."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Этим вариантом следует воспользоваться, если вы хотите установить "
+#~ "<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."
+#~ msgstr ""
+#~ "Если на компьютере установлена ​​одна или несколько предыдущих версий "
+#~ "<application>Mageia</application>, то программа установки предоставит вам "
+#~ "возможность обновить одну из установленных систем до последней версии."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Руководство"
diff --git a/docs/docs/stable/installer/sk.po b/docs/docs/stable/installer/sk.po
index 7374ea5f..acb6d2a8 100644
--- a/docs/docs/stable/installer/sk.po
+++ b/docs/docs/stable/installer/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2016-07-17 11:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -27,12 +27,13 @@ msgstr "Licencia a poznámky k vydaniu"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -66,8 +67,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Ak ich chcete prijať, jednoducho vyberte <guilabel>Prijať</guilabel> a potom "
@@ -90,9 +92,10 @@ msgstr "Poznámky k vydaniu"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Sú k dispozícii dôležité informácie o tomto vydaní <application>Mageia</"
@@ -100,13 +103,13 @@ msgstr ""
 "vydaniu</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "sk"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Výber zdroja (Nastavenie doplnkových inštalačných zdrojov)"
 
@@ -114,23 +117,25 @@ msgstr "Výber zdroja (Nastavenie doplnkových inštalačných zdrojov)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Táto obrazovka vám dáva zoznam juž rozpoznaných úložísk. Môžete pridať "
 "ďalšie zdroje balíčkov, ako je optický disk alebo vzdialené zdroje. Výber "
@@ -138,23 +143,25 @@ msgstr ""
 "nasledujúcich krokov."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Pre sieťové zdroje, sú potrebné dva nasledujúce kroky:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Výber a aktivácia siete, ak nie je už spustená."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Vybrať zrkadlový server alebo zadať URL adresu (prvý vstup). Výberom "
 "niektorého zo zrkadlových serverov budete mať prístup k ponukám všetkých "
@@ -163,14 +170,15 @@ msgstr ""
 "inštaláciu."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Ak aktualizujete 64 bitovú inštaláciu, ktorá môže obsahovať niektoré 32 "
 "bitové balíčky, vtedy sa odporúča použiť túto obrazovku pre pridanie "
@@ -186,7 +194,7 @@ msgstr "Spravovanie používateľa a superpoužívateľa"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -200,21 +208,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavenie správcovho (rootovho) hesla:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Pre všetky inštalácie <application>Mageie</application> sa odporúča nastaviť "
 "superužívateľovo alebo správcovo heslo, ktoré sa v Linuxe zvyčajne nazýva aj "
@@ -226,25 +234,28 @@ msgstr ""
 "prvom políčku."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Všetky heslá sú citlivé na veľkosti písmen; najlepšie je použiť v hesle "
 "kombináciu písmen (veľkých a malých), čísel a ostatných znakov."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Pridať používateľa"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Tu pridajte používateľa. Používateľ má menej oprávnení než superpoužívateľ "
 "(root), ale dostatok pre surfovanie po internete, používanie kancelárskych "
@@ -252,7 +263,7 @@ msgstr ""
 "so svojím počítačom."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -261,7 +272,7 @@ msgstr ""
 "používateľa."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -270,10 +281,11 @@ msgstr ""
 "používateľovo meno."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Prihlasovacie meno</guilabel>: Sem môžete zadať používateľovo "
@@ -282,42 +294,43 @@ msgstr ""
 "citlivé na veľkosť písmen.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Heslo</guilabel>: Do tohto textového poľa by ste mali napísať "
 "používateľské heslo. Na konci textového políčka je štít, ktorý naznačuje "
 "silu heslu. (Pozrite aj <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
 "heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
 "textových políčok pre používateľské heslo."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 #, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Každý používateľ, ktorého pridáte počas inštalácie Mageia, bude mať svetom "
 "čitateľný domovský adresár (ale ochránený proti zápisu)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -327,87 +340,60 @@ msgstr ""
 "používateľov</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Prístupové oprávnenia možno meniť aj po inštalácii."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Rozšírená správa používateľov"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Ak kliknete na tlačidlo <guibutton>pokročilé</guibutton>, bude vám ponúknutá "
 "obrazovka, ktorá vám dovoľuje upravovať nastavenia pre používateľa, ktorého "
 "pridávate."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Na dôvažok môžete zakázať alebo povoliť hosťovský účet."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Čokoľvek, čo si hosť s predvoleným hostiteľským účtom <emphasis>rbash</"
-"emphasis> uloží do svojho /domáceho adresára, bude zmazané v okamihu keď sa "
-"odhlási. Hosť by si mal uložiť svoje dôležité súbory na USB kľúč."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Povoliť hosťovský účet</guilabel>: Tu môžete povoliť alebo zakázať "
-"hosťovský účet. Hosťovský účet dovoľuje hosťovi prihlásiť sa k vášmu PC a "
-"používať ho, ale má viacej obmedzený prístup než normálni používatelia."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Ulita</guilabel>: Tento rozbaľovací zoznam vám umožňuje zmeniť "
 "ulitu (shell, prekladač príkazov) použitú používateľom, ktorého pridávate na "
 "predošlej obrazovke, možnosťami sú Bash, Dash a Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>ID používateľa</guilabel>: Tu môžete nastaviť používateľovo ID pre "
 "používateľa, ktorého pridávate na predošlej obrazovke. Je to číslo. "
 "Ponechajte ho prázdne, pokiaľ neviete, čo robíte."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>ID skupiny</guilabel>: Toto vám umožňuje nastaviť ID skupiny. Tiež "
-"je to číslo, zvyčajne to isté, ako pre používateľa. Ponechajte ho prázdne, "
-"pokiaľ neviete, čo robíte."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Zvoľte body pripojenia"
 
@@ -424,13 +410,14 @@ msgstr "Zvoľte body pripojenia"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -440,7 +427,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -451,41 +438,45 @@ msgstr ""
 "body zmeniť."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Ak zmeníte čokoľvek, uistite sa, že stále ešte máte <literal>/</literal> "
 "(koreňovú) partíciu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Každá partícia je ukázaná nasledovne: \"Zariadenie\" (\"Kapacita\", "
 "\"Prípojný bod\", \"Typ\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Zariadenie\" je zloženinou z \"pevného disku\", [\"čísla pevného disku"
-"\"(písmena)] a \"čísla partície\" (napríklad, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Ak máte mnohé partície, môžete si vybrať mnoho rôznych prípojných bodov z "
 "rozbaľovacej ponuky, aké sú <literal>/</literal>, <literal>/home</literal> a "
@@ -495,20 +486,22 @@ msgstr ""
 "inštalácie kotla."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Pre partície, ku ktorým nepotrebujete mať prístup, môžete ponechať prázdne "
 "políčko prípojného bodu."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Vyberte <guibutton>Predošlé</guibutton>, ak si nie ste istí, čo si máte "
 "zvoliť a potom zaškrtnite <guilabel>Vlastné rozdelenie disku</guilabel>. V "
@@ -516,7 +509,7 @@ msgstr ""
 "typ a veľkosť."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -781,8 +774,9 @@ msgstr "Výber pracovného prostredia"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "V závislosti na tomto vašom výbere, vám môžu byť ponúknuté ďalšie obrazovky "
@@ -790,8 +784,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -811,14 +806,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Vyberte si, či chcete používať prostredie obrazovky <application>KDE</"
 "application> alebo <application>Gnome</application>. Obe prostredia sú "
@@ -847,8 +844,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -860,24 +858,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Pracovná stanica."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafické prostredie."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuálny výber balíčkov: Túto voľbu môžte použiť pre ručné pridanie "
 "alebo odobranie balíčkov."
@@ -886,37 +888,39 @@ msgstr ""
 #: en/choosePackageGroups.xml:38
 #, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Prečítajte si <xref linkend=\"minimal-install\"></xref> pre inštrukcie o "
 "tom, ako vykonať minimálnu inštaláciu (bez alebo s X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Výber jednotlivých balíčkov"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Tu môžete pridávať alebo odoberať všetky doplnkové balíčky pre prispôsobenie "
 "inštalácie."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -931,46 +935,44 @@ msgstr ""
 "inštalácie a zvolením načítania ho."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Nastavenie služieb"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Tu si môžete nastaviť, ktoré služby (ne)spúšťať pri zavádzaní vášho systému."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Sú tu 4 skupiny. Kliknutím na šípku pred skupinou rozbalíte danú skupinu a "
-"uvidíte služby, ktoré obsahuje."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Nastavenia ktoré DrakX vybral si zvyčajne dobré."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -979,7 +981,7 @@ msgstr ""
 "nižšie."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
 
@@ -992,12 +994,13 @@ msgstr "Nastavenie časového pásma"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1007,18 +1010,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Vyberte si časové pásmo výberom vašej zeme alebo mesta blízko vás v rovnakom "
 "časovom pásme."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "V ďalšom okne si môžete vybrať nastavenie vašich hardvérových hodín na "
 "miestny čas alebo na GMT, známy aj ako UTC."
@@ -1033,23 +1038,24 @@ msgstr ""
 "všetky nastavené na miestny čas, alebo všetky na UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Výber X Servera (Konfigurácia vašej grafickej karty)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1058,7 +1064,7 @@ msgstr ""
 "identifikuje video zariadenie."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1067,101 +1073,98 @@ msgstr ""
 "viete, akú máte kartu, môžete ju vybrať zo stromu:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "dodávateľ"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "potom názov vašej karty"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "a typ vašej karty"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Ak nemôžete nájsť svoju kartu v zoznamoch dodávateľov (pretože ešte nie je v "
-"databáze, alebo je to staršia karta) môžete nájsť vhodný ovládač v kategórii "
-"Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Zoznam Xorg poskytuje viac než 40 všeobecných a open source ovládačov "
 "grafických kariet. Ak stále nemôžete nájsť názov ovládača pre kartu, "
 "existuje možnosť použitia VESA ovládača, ktorý poskytuje základné možnosti."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Pamätajte, že ak vyberiete nekompatibilný ovládač, môžete mať prístup iba k "
 "rozhraniu príkazového riadka."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Niektorí výrobcovia grafických kariet poskytujú proprietárne ovládače pre "
 "Linux, ktoré môžu byť k dispozícii v nonfree úložisku a v niektorých "
 "prípadoch len z webových stránok výrobcu karty."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Prístup k Nonfree úložisku musí byť výslovne povolený pre ich sprístupnenie. "
 "Ak tomu tak nie je, najskôr ho povoľte. Toto by ste mali urobiť po prvom "
 "reštarte."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Nastavenie grafickej karty a monitoru"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Bez ohľadu na to, ktoré grafické prostredie (známe aj ako prostredie "
 "pracovnej plochy) ste si vybrali pre túto inštaláciu <application>Mageia</"
@@ -1175,7 +1178,7 @@ msgstr ""
 "myslíte, že voľba je nekorektná."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1184,13 +1187,14 @@ msgstr ""
 "zoznamu vašu kartu, ak je to treba."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Máte na výber možnosť "
 "<guilabel>Plug'n Play</guilabel> ak je použiteľná, alebo si vybrať váš "
@@ -1200,30 +1204,31 @@ msgstr ""
 "obnovovacej frekvencie vášho monitora."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Nesprávne obnovovacie frekvencie môžu zničiť váš monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Rozlíšenie</guibutton></emphasis>: Tu nastavte "
 "požadované rozlíšenie a farebnú hĺbku vášho monitora."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Nie vždy sa testovacie "
 "tlačidlo objaví počas inštalácie. Ak tu je toto tlačidlo, môžete upraviť "
@@ -1235,7 +1240,7 @@ msgstr ""
 "dispozícii.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1244,12 +1249,12 @@ msgstr ""
 "či povoliť alebo zakázať rôzne možnosti."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Výber vášho monitoru"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1258,12 +1263,13 @@ msgstr ""
 "ten váš."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Vybratie monitora s odlišnými charakteristikami môže poškodiť váš "
 "monitor alebo video hardvér. Neskúšajte prosím nič bez toho, že viete čo "
@@ -1271,23 +1277,23 @@ msgstr ""
 "vášmu monitoru."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Vlastné</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1300,7 +1306,7 @@ msgstr ""
 "synchronizácie je rýchlosť, ktorou sú zobrazované skenované riadky."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1313,12 +1319,12 @@ msgstr ""
 "konzervatívne nastavenie a preverte ho v dokumentácii k vášmu monitoru."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1327,12 +1333,12 @@ msgstr ""
 "monitorov."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Dodávateľ</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1341,28 +1347,30 @@ msgstr ""
 "môžete si ho zvoliť zo stromu pomocou výberu:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "mena výrobcu monitora"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "popisu monitora"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Všeobecný</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "výber tejto skupiny zobrazí približne 30 konfigurácií obrazovky, ako sú "
 "1024x768 @ 60Hz zahŕňajúc i ploché panelové obrazovky, aké sú používané v "
@@ -1372,12 +1380,12 @@ msgstr ""
 "vašom výbere."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1389,12 +1397,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Ak si prajete použiť šifrovanie na vašej <literal>/</literal> partícii, "
 "musíte sa uistiť, že máte odčlenenú <literal>/boot</literal> partíciu. "
@@ -1402,89 +1412,90 @@ msgstr ""
 "literal> partíciu, inak váš systém nebude možné zaviesť."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Tu upravíte rozloženie vášho disku (diskov). Môžete odstraňovať alebo "
 "vytvárať partície, meniť súborový systém partície, alebo meniť jej veľkosť a "
 "dokonca si prezrieť, čo je v nich, predtým ako začnete."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Je tam karta pre každý nájdený pevný disk alebo iné úložné zariadenie, ako "
-"je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Stlačte <guibutton>Vyčistiť všetko</guibutton> pre zmazanie všetkých "
 "partícií na vybranom úložnom zariadení."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Pre všetky ostatné akcie: kliknite najprv na požadovanú partíciu. Potom si "
 "ju prezrite, alebo si vyberte súborový systém a prípojný bod, zmeňte je "
 "veľkosť alebo ju prečistite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Pokračujte dokým ste nenastavili všetko podľa vášho priania."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Kliknite na tlačidlo <guibutton>Hotovo</guibutton>, keď ste nachystaní."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 #, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
 "Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1494,7 +1505,7 @@ msgstr ""
 "Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1507,32 +1518,34 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Rozdelenie diskov"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "V tejto obrazovke môžete vidieť obsah vášho pevného disku (diskov) a vidieť "
 "nájdené riešenia DrakXovho sprievodcu rozdeľovaním disku navrhujúce, kam "
 "nainštalovať <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Možnosti dostupné z nižšie uvedeného zoznamu sa budú líšiť v závislosti na "
 "rozložení a obsahu vášho konkrétneho pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1545,12 +1558,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Použiť existujúce partície"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1559,12 +1572,12 @@ msgstr ""
 "kompatibilné partície a môžu byť použité pre inštaláciu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Použiť voľné miesto"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1573,12 +1586,12 @@ msgstr ""
 "využije pre vašu novú inštaláciu Mageie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Použiť voľné miesto na Windowsovej partícii"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1587,7 +1600,7 @@ msgstr ""
 "môže ponúknuť jeho použitie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1598,7 +1611,7 @@ msgstr ""
 "zazálohované všetky dôležité súbory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1614,12 +1627,14 @@ msgstr ""
 "použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "U tejto možnosti, inštalátor zobrazí zostávajúcu Windowsovú partíciu vo "
 "svetlomodrej a budúcu partíciu Mageie v tmavomodrej farbe spolu s ich "
@@ -1628,37 +1643,38 @@ msgstr ""
 "nižšie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Vymazať a použiť Celý Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Táto možnosť použije celé diskové zariadenie pre Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte "
 "opatrní!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1668,13 +1684,13 @@ msgstr ""
 "disku, ktoré nie ste pripravení stratiť, potom nepoužívajte túto voľbu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1683,68 +1699,82 @@ msgstr ""
 "disku (resp. diskoch)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 #, fuzzy
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "Inštalátor rozdelí dostupné miesto podľa nasledovných pravidiel:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Ak je celkové dostupné miesto menšie než 50 GB, bude vytvorená len jedna "
 "partícia pre /, nebude tu žiadna samostatná partícia pre /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Ak je celkové dostupné miesto nad 50 GB, potom sa vytvoria tri partície"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 z celkového dostupného miesta je pridelených pre / ,nanajvýš však 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 je pridelená pre swap , nanajvýš však 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "zvyšok (prinajmenšom 12/19) je pridelený pre /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "To znamená, že v prípade 160 GB a viac dostupného miesta, inštalátor vytvorí "
 "tri partície: 50 GB pre /, 4 GB pre swap a zvyšok pre adresár /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 #, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Ak používate UEFI systém, ESP (EFI Systémová Partícia) bude automaticky "
 "rozpoznaná, alebo vytvorená, ak ešte neexistuje, a pripojená na /boot/EFI. "
@@ -1752,17 +1782,17 @@ msgstr ""
 "bolo správne vykonané"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1774,7 +1804,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1784,15 +1814,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Niektoré novšie mechaniky teraz používajú 4096 bajtové logické sektory, "
 "namiesto predošlého štandardu 512 bajtových logických sektorov. Kvôli "
@@ -1804,19 +1835,22 @@ msgstr ""
 "nastavenia:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Zarovnať na\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Tiež sa ubezpečte, že všetky partície sú vytvorené s párnym počtom "
 "megabajtom."
@@ -1827,7 +1861,7 @@ msgid "Installation from LIVE medium"
 msgstr "Inštalácia zo ŽIVÉHO dátového nosiča"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1842,18 +1876,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Oficiálna dokumentácia pre Mageiu"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1865,7 +1899,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1877,7 +1911,7 @@ msgstr ""
 "\">NeoDoc</link>om."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1889,13 +1923,13 @@ msgstr ""
 "link>, ak by ste chceli pomôcť vylepšiť tento manuál."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1907,26 +1941,34 @@ msgstr ""
 "voľbách, ktoré spravíte počas inštalácie."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Inštalácia s DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Február 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1934,7 +1976,7 @@ msgstr "Gratulujeme"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1945,7 +1987,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1955,16 +1997,17 @@ msgstr ""
 "teraz je bezpečné vybrať inštalačné médium a reštartovať váš počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Po reštarte, na obrazovke zavádzača, si môžete vybrať spomedzi operačných "
 "systémov vo vašom počítači (ak ich máte viac než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1973,12 +2016,12 @@ msgstr ""
 "vybraná a spustená vaša nainštalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Nech sa vám páči!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1994,31 +2037,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -2030,21 +2073,19 @@ msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Všeobecný</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2052,28 +2093,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formátovanie"
 
@@ -2082,41 +2123,42 @@ msgstr "Formátovanie"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Tu si môžete vybrať, ktorú partíciu (alebo partície) si prajete "
 "naformátovať. Všetky dáta na partíciách <emphasis>nevyznačených</emphasis> "
 "pre naformátovanie budú ušetrené."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Zvyčajne prinajmenšom partície, ktoré DrakX vybral, potrebujú byť "
 "naformátované."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2125,12 +2167,13 @@ msgstr ""
 "chcete skontrolovať na takzvané <emphasis>chybné bloky</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Ak si nie ste istí, či ste vykonali správnu voľbu, môžete kliknúť na "
 "tlačidlo <guibutton>Predošlé</guibutton>, opäť na <guibutton>Predošlé</"
@@ -2139,7 +2182,7 @@ msgstr ""
 "na vašich partíciach."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2148,12 +2191,12 @@ msgstr ""
 "pokračovanie."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, inštalátor Mageie"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2164,7 +2207,7 @@ msgstr ""
 "aktualizáciu čo najľahšou ako sa len dá."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2173,64 +2216,74 @@ msgstr ""
 "spustí inštalátor, ktorý bude zvyčajne všetko, čo potrebujete."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Uvítacia inštalačná obrazovka"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Použitie zavádzača Mageie"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Tu sú predvolené uvítacie obrazovky, pri používaní DVD Mageia. Prvá je s "
 "obstarožným systémom a druhá s UEFI systémom:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Na tejto prvej obrazovke je možné nastaviť niektoré osobné nastavenia:"
+#: 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:45
+#: 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 ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Jazyk (len pre inštaláciu, môže sa odlišovať od zvoleného systémového "
-"jazyka) stlačením klávesy F2 (len v obstarožnom režime)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2239,39 +2292,24 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr "Použite šípkové klávesy pre výber jazyka a stlačte klávesu Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Tu je napríklad francúzska uvítacia obrazovka keď používate Živé DVD/CD. "
-"Pamätajte, že ponuka na Live DVD/CD nepredkladá: <guilabel>Záchranný systém</"
-"guilabel>, <guilabel>Pamäťový test</guilabel> a <guilabel>Nástroj na "
-"detekciu hardvéru</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Zmeňte rozlíšenie obrazovky stlačením klávesy F3 (len v obstarožnom režime)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2280,52 +2318,53 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Pridajte niektoré možnosti kernelu stlačením klávesy <emphasis role=\"bold"
-"\">F6</emphasis> v obstarožnom režime alebo klávesy <emphasis role=\"bold"
-"\">e</emphasis> key v režime UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Predvolené, táto nemení nič v predvolených možnostiach."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Ak inštalácia zlyháva, vtedy môže byť nutné vyskúšať znova jednu z extra "
-"možností. Ponuka vyvolaná cez F6 zobrazuje nový riadok nazvaný "
-"<guilabel>Zavádzacie možnosti</guilabel> a ponúkne štyri položky:"
+"- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
+"výkonnosti."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Predvolené, táto nemení nič v predvolených možnostiach."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Žiadne ACPI (Pokročilé rozhrania konfigurácie a napájania), spravovanie "
 "napájania nie je brané do úvahy."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Žiaden lokálny APIC (lokálny pokročilý programovateľný ovládač prerušení), "
 "jedná sa o prerušenia CPU, vyberte túto možnosť, ak ste k tomu vyzvaní."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2334,18 +2373,19 @@ msgstr ""
 "zobrazené v riadku <guilabel>Možnosti zavádzania systému</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "V niektorých vydaniach Mageie sa môže stať, že sa položky vybrané s klávesou "
 "F6 neobjavujú v riadku <guilabel>Možností zavádzania o.s.</guilabel>, avšak "
 "v skutočnosti sú brané do úvahy."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2354,26 +2394,20 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Pridajte viacero možností kernelu stlačením klávesy F1 (len v obstarožnom "
-"režime)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 #, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Stlačenie F1 otvára nové okno s ďalšími dostupnými možnosťami. Vyberte jednu "
 "so šípkovými klávesami a stlačte Enter pre obdržanie viacej detailov alebo "
 "stlačte klávesu Esc pre pre návrat na uvítaciu obrazovku."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2382,12 +2416,13 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Podrobný prehľad o rozsahu možností. Stlačte Esc alebo zvoľte "
 "<guilabel>Návrat ku Zavádzacím Možnostiam</guilabel> pre návrat späť k "
@@ -2395,7 +2430,7 @@ msgstr ""
 "<guilabel>Možnosti zavedenia</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2404,12 +2439,15 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Nápoveda je preložená vo zvolenom jazyku s klávesou F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2420,83 +2458,48 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-#, fuzzy
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Tu je predvolená uvítacia obrazovka pri používaní inštalačného CD založeného "
-"na pripojení k sieti (obrazy Boot.iso alebo Boot-Nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Nedovoľuje zmeniť jazyk, dostupné možnosti sú popísané na obrazovke. Pre "
-"viacej informácií o používaní inštalačného CD založeného na pripojení k "
-"sieti, pozrite <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
-"\">Mageia Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Rozloženie klávesnice je americké."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Kroky inštalácie"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Proces inštalácie je rozdelený do viacerých krokov, ktoré je možno sledovať "
 "na bočnom paneli obrazovky."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Každý krok má jednu alebo viacero obrazoviek, ktoré tiež môžu mať "
 "<guibutton>Pokročilé</guibutton> tlačidlá so zvyčajne menej žiadanými extra "
 "možnosťami."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Väčšina obrazoviek má tlačidlá <guibutton>Pomoc</guibutton>, ktoré dávajú "
 "bližšie vysvetlenia o aktuálnom kroku."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2514,17 +2517,17 @@ msgstr ""
 "súčasne <guibutton>Alt Ctrl Delete</guibutton> pre reštart."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy pri inštalácií a možné riešenia"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Žiadne grafické rozhranie"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2535,13 +2538,16 @@ msgstr ""
 "nízke rozlíšenie obrazovky napísaním <code>vgalo</code> v príkazovom riadku."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Ak je hardvér veľmi starý, grafická inštalácia nemusí byť možná. V tomto "
 "prípade sa oplatí vyskúšať inštaláciu v textovom režime. Pre jej použitie "
@@ -2550,12 +2556,12 @@ msgstr ""
 "ENTER. Teraz pokračujte s inštaláciou v textovom režime."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Inštalácia zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2570,14 +2576,15 @@ msgstr ""
 "možnosťami, ak je treba."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Problém s RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2588,18 +2595,20 @@ msgstr ""
 "napr. <code>mem=256M</code> by znamenala 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamické partície"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Ak ste konvertovali váš pevný disk zo \"základného\" formátu na \"dynamický"
 "\" formát v systéme Microsoft Windows, musíte vedieť, že je nemožné "
@@ -2618,18 +2627,19 @@ msgstr "Aktualizácie"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2638,10 +2648,11 @@ msgstr ""
 "niektoré balíčky boli aktualizované alebo vylepšené."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Vyberte si <guilabel>áno</guilabel>, ak si ich prajete stiahnuť a "
@@ -2649,8 +2660,9 @@ msgstr ""
 "alebo ak nie ste pripojení k internetu."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Potom stlačte <guibutton>Ďalej</guibutton> pre pokračovanie"
 
 #. type: Content of: <section><info><title>
@@ -2708,18 +2720,19 @@ msgstr "Výber nosiča (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2731,7 +2744,7 @@ msgstr ""
 "ktoré balíčky budú dostupné na výber počas ďalších krokov."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2740,7 +2753,7 @@ msgstr ""
 "obsahuje základ distribúcie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2755,13 +2768,14 @@ msgstr ""
 "ovládače pre grafické karty nVidia a ATI, firmvér pre rôzne WiFi karty, atď."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "Repozitár pre <emphasis>Tainted</emphasis> čiže po slovensky poškvrnený "
 "softvér obsahuje balíčky uvoľnené pod slobodnou licenciou. Hlavným kritériom "
@@ -2771,37 +2785,40 @@ msgstr ""
 "pre prehrávanie komerčných video DVD, atď."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimálna inštalácia"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Môžete si zvoliť Minimálnu inštaláciu odznačením všetkého na obrazovke "
 "Výberu Skupín Balíčkov, viď <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Ak je žiadaná, môžete dodatočne zaškrtnúť možnosť pre \"individuálny výber "
 "balíčkov\" na rovnakej obrazovke."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Minimálna inštalácia je zamýšľaná pre tých, čo zamýšľajú špecifické využitie "
 "svojej <application>Mageie</application>, akým je server alebo "
@@ -2811,9 +2828,10 @@ msgstr ""
 "xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Ak ste si zvolili túto inštalačnú triedu, potom vám príslušná obrazovka "
@@ -2821,16 +2839,14 @@ msgstr ""
 "dokumentácia a X server."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Ak je vybrané, vtedy \"Spolu s X\" pripojí aj IceWM ako ľahké desktopové "
-"prostredie."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2845,15 +2861,16 @@ msgstr ""
 "jadrových utilitách</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2870,11 +2887,12 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX spravil chytré voľby pre konfiguráciu vášho systému závisiace na "
 "voľbách, ktoré ste spravili a na hardvéri, ktoré DrakX zistil. Nastavenia "
@@ -2884,8 +2902,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2900,72 +2918,74 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parametre systému"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časové pásmo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX pre vás vybral časové pásmo, vzhľadom k vášmu obľúbenému jazyku. "
 "Môžete ju zmeniť, ak je to potrebné. Pozrite tiež <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Krajina / Región</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Ak nie ste vo vybranej krajine, je veľmi dôležité, aby ste napravili toto "
 "nastavenie. Pozrite <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zavádzač</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX spravil dobré výbery pre nastavenie zavádzača systému."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 msgstr "Nič na tom nemeňte, ak neviete, ako konfigurovať Grub a/alebo Lilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Pre viac informácií, viď <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Správa používateľov</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2974,22 +2994,23 @@ msgstr ""
 "<literal>/home</literal> t. j. domáce adresáre."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Služby</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systémové služby označujú tie malé programy, ktoré bežia v pozadí (tzv. "
 "démoni, čo je však zvrátené historické prirovnanie). Tento nástroj vám "
 "umožňuje povoliť alebo zakázať určité úlohy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2998,43 +3019,44 @@ msgstr ""
 "zabrániť správnemu behu vášho počítača."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Pre viac informácií, viď <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Hardvérové parametre"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klávesnica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Tuná nastavujete alebo meníte rozloženie vašej klávesnice, ktoré bude "
 "záležať na vašej polohe, jazyku alebo type klávesnice."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Myš</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3043,40 +3065,41 @@ msgstr ""
 "trackbally atď."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvuková karta</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Inštalátor používa predvolený ovládač, ak predvolený jestvuje. Možnosť "
 "výberu odlišného ovládača je daná len vtedy, keď jestvuje viac než jeden "
 "ovládač pre vašu kartu, ale žiaden z nich nie je predvolený."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafické rozhranie</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Táto sekcia vám dovoľuje konfigurovať vašu grafickú kartu (resp. karty) a "
 "obrazovky."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Pre viac informácií, viď <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -3087,20 +3110,21 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Nastavenia siete a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sieť</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3109,21 +3133,22 @@ msgstr ""
 "Mageia</application>, ak ste ešte nepovolili repozitáre Neslobodných nosičov."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Keď pridávate sieťovú kartu, nezabudnite zároveň nastaviť i váš firewall na "
 "sledovanie onoho rozhrania."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy servery</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3134,26 +3159,27 @@ msgstr ""
 "niektorej proxy služby."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Možno sa budete potrebovať poradiť s vaším systémovým správcom pre získanie "
 "parametrov, ktoré sem potrebujete zadať"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Bezpečnosť"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3162,17 +3188,17 @@ msgstr ""
 "predvolené nastavenie (Štandardná) je adekvátna pre bežné použitie."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Zaškrtnite voľbu, ktorá sa najlepšie hodí k vášmu používaniu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3182,7 +3208,7 @@ msgstr ""
 "rozširovať alebo ukradnúť."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 #, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
@@ -3193,7 +3219,7 @@ msgstr ""
 "výbery budú záležať na tom, k čomu používate váš počítač."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Majte na pamäti, že dovolenie všetkého (žiaden firewall) môže byť veľmi "
@@ -3269,40 +3295,74 @@ msgstr ""
 "učinilo miesto pre inštaláciu <application>Mageie</application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Úroveň bezpečnosti"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Tu môžete upraviť vašu úroveň bezpečnosti."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"Ponechajte predvolené nastavenia ako sú, ak neviete, čo si máte vybrať."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Aj po inštalácii bude vždy možné upraviť vaše bezpečnostné nastavenia v "
 "časti <guilabel>Bezpečnosť</guilabel> Ovládacieho Centra Mageie."
@@ -3319,25 +3379,27 @@ msgstr "Úvod"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia je šírená cestou ISO obrazov. Táto stránka vám pomôže vybrať si, "
 "ktorý obraz vyhovuje vašim potrebám."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Sú tu dve rodiny nosičov:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klasický inštalátor: Po zavedení z nosiča, bude nasledovať postup dovoľujúci "
 "výber toho, čo chcete nainštalovať a ako nakonfigurovať váš cieľový systém. "
@@ -3345,82 +3407,86 @@ msgstr ""
 "možnosti výberu, ktoré Prostredie Pracovnej Plochy si nainštalujete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"ŽIVÝ nosič dát: môžete zaviesť nosič v reálnom systéme Mageia bez jeho "
-"inštalácie, aby ste videli, čo dostanete po inštalácii. Proces inštalácie je "
-"jednoduchší, ale dostanete menej možností výberu."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Podrobnosti sú uvedené v ďalších častiach."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Dátové nosiče"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definícia"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Tu je médiom (nosičom) obrazový súbor ISO, ktorý vám umožňuje inštalovať a/"
 "alebo aktualizovať Mageiu a pri rozšírení akúkoľvek fyzickú podporu, na "
 "ktorú je ISO súbor skopírovaný."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Môžete ich nájsť <link ns4:href=\"http://www.mageia.org/en/downloads/\">tu</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klasické inštalačné nosiče"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Bežné vlastnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Tieto ISO súbory používajú tradičný inštalátor nazvaný drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Dokážu spraviť čistú inštaláciu alebo aktualizovať z predošlých vydaní."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3429,119 +3495,124 @@ msgstr ""
 "Pamäťový test, Nástroj na detekciu hardvéru."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 "Každé DVD obsahuje mnohé dostupné prostredia pracovnej plochy a jazyky."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "Počas inštalácie vám bude daná voľba pridať si neslobodný softvér."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Živé nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Môžu byť použité na obhliadku distribúcie bez jej nainštalovania na pevný "
 "disk i na voliteľné nainštalovanie Mageie na váš pevný disk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 #, fuzzy
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "Každé ISO obsahuje len jedno prostredie pracovnej plochy (KDE alebo GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Živé ISO súbory môžu byť použití len na vytvorenie "
 "čistých inštalácií, nemôžu byť použité na aktualizáciu z predošlých vydaní.</"
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Obsahujú neslobodný softvér."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 #, fuzzy
 msgid "Live DVD Plasma"
 msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 #, fuzzy
 msgid "Plasma desktop environment only."
 msgstr "iba KDE prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Všetky jazyky sú prítomné."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Živé DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "ibe GNOME prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 #, fuzzy
 msgid "Live DVD Xfce"
 msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 #, fuzzy
 msgid "Xfce desktop environment only."
 msgstr "iba KDE prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 #, fuzzy
 msgid "32 or 64 bit architectures."
 msgstr "Rôzne nosiče pre 32 alebo 64 bitové architektúry."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Iba bootovacie CD nosiče"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Spustiť inštaláciu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3553,29 +3624,31 @@ msgstr ""
 "na lokálnej sieti alebo na internete."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Tieto nosiče sú veľmi ľahké (menšie než 100 MB) a sú vhodné, keď prenosové "
 "pásmo príliš malé pre stiahnutie plného DVD, keď PC nemá DVD mechaniku alebo "
 "keď PC nedokáže naštartovať z USB kľúča."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "iba anglický jazyk."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 #, fuzzy
 msgid "netinstall.iso"
 msgstr "Spustiť inštaláciu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 #, fuzzy
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
@@ -3614,9 +3687,9 @@ msgstr "Sťahovanie"
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Ak ste si už vybrali váš ISO súbor, môžete ho stiahnuť pomocou buď http "
 "alebo BitTorrentu. V oboch prípadoch vám okno podáva pár informácií, ako sú "
@@ -3632,9 +3705,9 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 #: en/SelectAndUseISOs2.xml:195
 #, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum a sha1sum sú nástroje pre skontrolovanie neporušenosti ISO súboru. "
 "Jeden z nich si ponechajte <link linkend=\"integrity\">pre budúce použitie</"
@@ -3647,8 +3720,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Zaškrtnite prepínacie tlačidlo Uložiť Súbor."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3657,15 +3730,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Kontrolovanie neporušenosti stiahnutého nosiča"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 #, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Obe kontrolné súčty sú hexadecimálne čísla vypočítané algoritmom zo súboru, "
 "ktorý má byť stiahnutý. Keď požiadate tieto algoritmy na znovuprepočítanie "
@@ -3675,69 +3748,84 @@ msgstr ""
 "znova."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Otvorte konzolu, netreba byť rootom, a:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- pre použitie md5sum, napíšte: [sam@localhost]$ <userinput>md5sum cesta/ku/"
 "obrazovemu/suboru.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- pre použitie sha1sum, napíšte: [sam@localhost]$ <userinput>sha1sum cesta/"
 "ku/obrazovemu/suboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"a porovnajte získané číslo z vášho počítača (možno naň budete musieť chvíľku "
-"počkať) s číslom daným Mageiou. Napríklad:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"a porovnajte získané číslo z vášho počítača (možno naň budete musieť chvíľku "
+"počkať) s číslom daným Mageiou. Napríklad:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Vypálenie alebo vpísanie ISO súboru"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Skontrolované ISO môže byť teraz napálené na CD alebo DVD alebo vpísané na "
 "USB kľúč. Tieto operácie nie sú obyčajným kopírovaním a cielia k vytvoreniu "
 "zavediteľného nosiča."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Napálenie ISO súboru na CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Použite ktorýkoľvek napaľovací program, ktorý si prajete, ale uistite sa, že "
 "napaľovacie zariadenie je správne nastavené na <emphasis role=\"bold"
@@ -3746,12 +3834,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Vpísať ISO na USB kľúčenku"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3760,18 +3848,19 @@ msgstr ""
 "USB kľúč a potom ho použiť na zavedenie a inštaláciu systému."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "\"vpísanie\" obrazu na flashové zariadenie zničí akýkoľvek predošlý súborový "
 "systém na zariadení; každé ostatné dáta budú stratené a kapacita partície "
 "bude zmenšená na veľkosť obrazu."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3780,12 +3869,12 @@ msgstr ""
 "naformátovať ho."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Použitím grafického nástroja v Mageii"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3794,73 +3883,72 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Použitím grafického nástroja vo Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Môžete vyskúšať:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=sk_SK\">Rufus</link> "
 "použijúc možnosť \"ISO obraz\";"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Použijúc Príkazový riadok v systéme GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Je potenciálne \"nebezpečné\" robiť toto ručne. Riskujete že prepíšete "
 "diskovú partíciu, zadáte nesprávne ID zariadenia."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Tiež môžete použiť dd nástroj v konzole:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Otvorte konzolu"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Staňte sa rootom použitím príkazu <userinput>su -</userinput> (nezabudnite "
 "na koncovú pomlčku '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3870,28 +3958,40 @@ msgstr ""
 "z neho čítať)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Vložte príkaz <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Nájdite meno zariadenia pre vašu USB kľúč (podľa jeho veľkosti), napríklad "
+"<code>/dev/sdb</code> na obrázku vyššie, je to 8GB USB kľúč."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Prípadne môžete získať meno zariadenia s príkazom <code>dmesg</code>: na "
 "konci, vidíte meno zariadenia začínajúce so <emphasis>sd</emphasis>, a "
 "<emphasis>sdd</emphasis> v tomto prípade:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3933,47 +4033,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Nájdite meno zariadenia pre vašu USB kľúč (podľa jeho veľkosti), napríklad "
-"<code>/dev/sdb</code> na obrázku vyššie, je to 8GB USB kľúč."
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Vložte príkaz: # <userinput>dd if=cesta/ku/ISO/suboru of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "kde X=názov vášho zariadenia, napr. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Príklad: # <userinput>dd if=/home/pouzivatel/Stiahnute/Mageia-4-x86_64-DVD."
 "iso of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Vložte príkaz: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Odpojte váš USB kľúč, je to hotovo."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4006,19 +4114,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Ak vaša krajina nie je v zozname, kliknite na tlačidlo <guilabel>Ostatné "
 "krajiny</guilabel> a tam si vyberte vašu krajinu / región."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Ak je vaša krajina len v zozname <guilabel>Ostatných krajín</guilabel>, po "
@@ -4026,19 +4136,19 @@ msgstr ""
 "zo zoznamu. Toto prosím ignorujte, DrakX bude nasledovať vašu reálnu voľbu."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Vstupná metóda"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 #, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "Na obrazovke <guilabel>Ostatné krajiny</guilabel> môžete si tiež zvoliť "
@@ -4052,68 +4162,67 @@ msgstr ""
 "FTP nosič pred výberom balíkov."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 #, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Ak ste počas inštalácie vynechali nastavenie vstupnej metódy, môžete ju "
 "sprístupniť po reštarte vášho nainštalovaného systému cez \"Konfigurovať váš "
 "Počítač\" -&gt; \"Systém\", alebo spustením localedrake ako root správca."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Inštalovanie alebo Aktualizovanie"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Inštalovanie"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Použite túto možnosť pre čerstvú inštaláciu <application>Mageie</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Aktualizovanie"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Ak máte jednu alebo viacero inštalácií <application>Mageie</application> na "
-"vašom systéme, inštalátor vám dovolí aktualizovať jednu z nich na najnovšie "
-"vydanie."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Iba aktualizovanie z predošlej verzie Mageie, ktorá bola <emphasis>ešte "
 "podporovaná</emphasis> keď bola vydaná verzia tohto inštalátora, bolo "
@@ -4123,16 +4232,17 @@ msgstr ""
 "partíciu."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Ak sa počas inštalácie rozhodnete zastaviť inštaláciu, je možné reštartovať "
 "počítač, ale skôr než toto urobíte, si to prosím dôkladne zvážte. Keď raz "
@@ -4144,12 +4254,14 @@ msgstr ""
 "stlačte súčasne <guilabel>Alt Ctrl Delete</guilabel> pre reštart."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Ak ste objavili, že ste zabudli vybrať nejaký doplnkový jazyk, môžete sa "
 "vrátiť z obrazovky \"Inštalácie a Aktualizácie\" ku výberu jazyka súčasným "
@@ -4184,12 +4296,12 @@ msgstr ""
 "časovej oblasti."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klávesnica"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4198,16 +4310,17 @@ msgstr ""
 "vhodná klávesnica, bude predvolené rozloženie kláves americkej klávesnice."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4225,23 +4338,25 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Ak vaša klávesnica nie je ukázaná v zozname, kliknite na tlačidlo "
 "<guibutton>Ďalšie</guibutton> pre získanie plného zoznamu, a tam si vyberte "
 "vašu klávesnicu."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Po vybratí klávesnice z dialógu <guibutton>Ďalšie</guibutton> sa vrátite ku "
 "prvému dialógu pre výber klávesnica a bude sa zdať, akoby bola zvolená "
@@ -4250,23 +4365,24 @@ msgstr ""
 "plného zoznamu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Ak ste si vybrali klávesnicu založenú na nelatinských znakoch, uvidíte extra "
 "dialógovú obrazovku pýtajúcu sa, ako by ste chceli prepínať medzi latinským "
 "a nelatinským rozložením klávesnice."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Prosím, zvoľte jazyk, ktorý chcete používať"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4277,7 +4393,7 @@ msgstr ""
 "inštalácie a pre váš inštalovaný systém."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -4288,12 +4404,13 @@ msgstr ""
 "inštalácie a pre váš inštalovaný systém."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Je možné, že budete potrebovať mať nainštalovaných viacero jazykov na vašom "
 "systéme, pre seba alebo pre ostatných používateľov, potom by ste mali použiť "
@@ -4301,7 +4418,7 @@ msgstr ""
 "náročné pridať extra jazykovú podporu po inštalácií."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -4315,18 +4432,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Ak ste si hoci aj zvolili viac než jeden jazyk, musíte si najprv vybrať "
 "jeden z nich ako vás prednostný jazyk na prvej jazykovej obrazovke. Ten bude "
 "tiež označený ako vybraný na obrazovke viacerých jazykov."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4335,23 +4453,24 @@ msgstr ""
 "odporúča nainštalovať takisto jazyk vašej klávesnice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia používa predvolene UTF-8 (Unicode) podporu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Táto môže byť vypnutá na obrazovke \"viaceré jazyky\", ak viete, že je "
 "nevhodná pre váš jazyk. Zakázanie UTF-8 sa použije pre všetky nainštalované "
 "jazyky."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4405,24 +4524,24 @@ msgstr ""
 "šesť alebo viac tlačidiel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 #, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
 "systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
@@ -4430,46 +4549,46 @@ msgstr ""
 "How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
+#: en/setupBootloader.xml:18
 #, fuzzy
-msgid "Grub2-efi for a UEFI system."
+msgid "GRUB2-efi for a UEFI system."
 msgstr "So systémom UEFI"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 #, fuzzy
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Grafické ponuky Mageie sú pekné:"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4484,30 +4603,33 @@ msgstr ""
 "\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
+#: en/setupBootloader.xml:38
 #, fuzzy
-msgid "Grub2-efi on UEFI systems"
+msgid "GRUB2-efi on UEFI systems"
 msgstr "So systémom UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 #, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "So systémom UEFI je používateľské rozhranie trochu odlišné, keďže si "
 "nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4520,15 +4642,15 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 #, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Ak je Mageia prvým systémom nainštalovaným na váš počítač, inštalátor "
@@ -4540,38 +4662,39 @@ msgstr ""
 "ktoré máte v počítači."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Použitie zavádzača Mageie"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4584,18 +4707,19 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Použitie už existujúceho zavádzača"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču "
 "presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať "
@@ -4604,20 +4728,20 @@ msgstr ""
 "systém."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4630,14 +4754,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4647,131 +4771,126 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
 "heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
 "textových políčok pre používateľské heslo."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Služby</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Nastavenie SCSI"
 
@@ -4784,36 +4903,39 @@ msgstr "Nastavenie SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX zvyčajne detekuje pevné disky správne. U niektorých starších SCSI "
 "ovládačov môže byť nemožné určiť správne ovládače, ktoré sa majú použiť a "
 "následne zlyháva rozpoznanie zariadenia."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Ak sa toto stane, budete potrebovať manuálne zadať DrakXu, ktoré SCSI "
 "zariadenie (alebo zariadenia) máte."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "DrakX by potom mal byť schopný nakonfigurovať ono zariadenie (alebo "
@@ -4837,10 +4959,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Na tejto obrazovke je udaný názov ovládača, ktorý zvolil inštalátor pre vašu "
 "zvukovú kartu, ktorý bude predvolený ovládač, pokiaľ máte niektorý "
@@ -4863,10 +4985,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Potom na obrazovke draksound alebo nástroja na \"Konfiguráciu zvuku\", "
 "kliknite na <guibutton>Rozšírené</guibutton> a potom na <guibutton>Riešenie "
@@ -4874,16 +4998,18 @@ msgstr ""
 "problém."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Rozšírené"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Kliknutie na <guibutton>Rozšírené</guibutton> na tejto obrazovke, počas "
 "inštalácie, je užitočné vtedy, ak tu nie je žiaden predvolený ovládač a sú "
@@ -4891,16 +5017,17 @@ msgstr ""
 "nesprávny ovládač."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "V tom prípade môžete zvoliť odlišný ovládač po kliknutí na <guibutton>Nechať "
 "mi vybrať iný ovládač</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrdenie naformátovania pevného disku"
 
@@ -4911,13 +5038,13 @@ msgstr "Potvrdenie naformátovania pevného disku"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4927,17 +5054,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Kliknite na <guibutton>Predošlé</guibutton> ak si nie ste istí vašou voľbou."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Kliknite na <guibutton>Ďalej</guibutton> ak ste si istí a chcete zmazať "
 "každú partíciu, každý operačný systém a všetky údaje na onom pevnom disku."
@@ -5061,44 +5191,42 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Odinštalovanie Mageie"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Ako na to"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Ak vás Mageia nepresvedčila alebo ju nemôžete správne nainštalovať, skrátka "
 "ak sa jej chcete zbaviť. Je to vaše právo a Mageia vám dáva aj možnosť "
 "odinštalovania. Toto neplatí u každého operačného systému."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Po zazálohovaní si vašich dát, reštartujte počítač s vaším inštalačným DVD "
 "Mageie a vyberte Záchranný systém, potom, Obnoviť Windowsový zavádzač. Pri "
 "ďalšom zavedení budete mať len Windows bez možnosti voľby vášho operačného "
 "systému."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Pre obnovu miesta použitého partíciami čiže diskovými oddielmi Mageie vo "
 "Windows, kliknite na <code>Štart -> Ovládacie panely -> Nástroje na správu -"
@@ -5108,8 +5236,8 @@ msgstr ""
 "umiestnenia na disku. Kliknite pravým tlačidlom na tieto partície a zvoľte "
 "<guibutton>Zmazať</guibutton>. Priestor bude uvoľnený."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5117,14 +5245,15 @@ msgstr ""
 "Ak používate Windows XP, môžete vytvoriť novú partíciu a naformátovať ju "
 "(FAT32 alebo NTFS). Bude jej priradené písmeno partície."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Ak máte Vistu alebo 7, máte o jednu možnosť viac, môžete rozšíriť existujúcu "
 "partíciu, ktorá je vľavo od voľného miesta. Sú aj iné nástroje na delenie "
@@ -5177,6 +5306,352 @@ msgstr ""
 "Ďalším krokom je kopírovanie súborov na pevný disk. Toto zaberie niekoľko "
 "minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne."
 
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Heslo (znova)</guilabel>: Znova zadajte do tohto textového poľa "
+#~ "heslo používateľa a drakx skontroluje, či máte rovnaké heslo v každom z "
+#~ "textových políčok pre používateľské heslo."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Na dôvažok môžete zakázať alebo povoliť hosťovský účet."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Čokoľvek, čo si hosť s predvoleným hostiteľským účtom <emphasis>rbash</"
+#~ "emphasis> uloží do svojho /domáceho adresára, bude zmazané v okamihu keď "
+#~ "sa odhlási. Hosť by si mal uložiť svoje dôležité súbory na USB kľúč."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Povoliť hosťovský účet</guilabel>: Tu môžete povoliť alebo "
+#~ "zakázať hosťovský účet. Hosťovský účet dovoľuje hosťovi prihlásiť sa k "
+#~ "vášmu PC a používať ho, ale má viacej obmedzený prístup než normálni "
+#~ "používatelia."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>ID skupiny</guilabel>: Toto vám umožňuje nastaviť ID skupiny. "
+#~ "Tiež je to číslo, zvyčajne to isté, ako pre používateľa. Ponechajte ho "
+#~ "prázdne, pokiaľ neviete, čo robíte."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Zariadenie\" je zloženinou z \"pevného disku\", [\"čísla pevného disku"
+#~ "\"(písmena)] a \"čísla partície\" (napríklad, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Pracovná stanica."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafické prostredie."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Sú tu 4 skupiny. Kliknutím na šípku pred skupinou rozbalíte danú skupinu "
+#~ "a uvidíte služby, ktoré obsahuje."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Ak nemôžete nájsť svoju kartu v zoznamoch dodávateľov (pretože ešte nie "
+#~ "je v databáze, alebo je to staršia karta) môžete nájsť vhodný ovládač v "
+#~ "kategórii Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "There is a tab for every detected hard disk or other storage device, like "
+#~ "an USB key. For example sda, sdb and sdc if there are three of them."
+#~ msgstr ""
+#~ "Je tam karta pre každý nájdený pevný disk alebo iné úložné zariadenie, "
+#~ "ako je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "Inštalátor rozdelí dostupné miesto podľa nasledovných pravidiel:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Zarovnať na\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
+
+#~ msgid ""
+#~ "<imageobject condition='classical'> <imagedata revision=\"1\" fileref="
+#~ "\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+#~ "condition='live'> <imagedata revision=\"1\" fileref=\"live-"
+#~ "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
+#~ "formatPartitions-im1\"> </imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata revision=\"1\" fileref="
+#~ "\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+#~ "condition='live'> <imagedata revision=\"1\" fileref=\"live-"
+#~ "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
+#~ "formatPartitions-im1\"> </imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr ""
+#~ "Na tejto prvej obrazovke je možné nastaviť niektoré osobné nastavenia:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Jazyk (len pre inštaláciu, môže sa odlišovať od zvoleného systémového "
+#~ "jazyka) stlačením klávesy F2 (len v obstarožnom režime)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Tu je napríklad francúzska uvítacia obrazovka keď používate Živé DVD/CD. "
+#~ "Pamätajte, že ponuka na Live DVD/CD nepredkladá: <guilabel>Záchranný "
+#~ "systém</guilabel>, <guilabel>Pamäťový test</guilabel> a <guilabel>Nástroj "
+#~ "na detekciu hardvéru</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Pridajte niektoré možnosti kernelu stlačením klávesy <emphasis role=\"bold"
+#~ "\">F6</emphasis> v obstarožnom režime alebo klávesy <emphasis role=\"bold"
+#~ "\">e</emphasis> key v režime UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Ak inštalácia zlyháva, vtedy môže byť nutné vyskúšať znova jednu z extra "
+#~ "možností. Ponuka vyvolaná cez F6 zobrazuje nový riadok nazvaný "
+#~ "<guilabel>Zavádzacie možnosti</guilabel> a ponúkne štyri položky:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Pridajte viacero možností kernelu stlačením klávesy F1 (len v obstarožnom "
+#~ "režime)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Tu je predvolená uvítacia obrazovka pri používaní inštalačného CD "
+#~ "založeného na pripojení k sieti (obrazy Boot.iso alebo Boot-Nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Nedovoľuje zmeniť jazyk, dostupné možnosti sú popísané na obrazovke. Pre "
+#~ "viacej informácií o používaní inštalačného CD založeného na pripojení k "
+#~ "sieti, pozrite <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+#~ "iso_install\">Mageia Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Rozloženie klávesnice je americké."
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Ak je vybrané, vtedy \"Spolu s X\" pripojí aj IceWM ako ľahké desktopové "
+#~ "prostredie."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Tu môžete upraviť vašu úroveň bezpečnosti."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Ponechajte predvolené nastavenia ako sú, ak neviete, čo si máte vybrať."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "ŽIVÝ nosič dát: môžete zaviesť nosič v reálnom systéme Mageia bez jeho "
+#~ "inštalácie, aby ste videli, čo dostanete po inštalácii. Proces inštalácie "
+#~ "je jednoduchší, ale dostanete menej možností výberu."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Iba bootovacie CD nosiče"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Zaškrtnite prepínacie tlačidlo Uložiť Súbor."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Tiež môžete použiť dd nástroj v konzole:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Odpojte váš USB kľúč, je to hotovo."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Použite túto možnosť pre čerstvú inštaláciu <application>Mageie</"
+#~ "application>."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Ak máte jednu alebo viacero inštalácií <application>Mageie</application> "
+#~ "na vašom systéme, inštalátor vám dovolí aktualizovať jednu z nich na "
+#~ "najnovšie vydanie."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Ako na to"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -5192,9 +5667,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Vlastný výber"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5205,20 +5677,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
-#~ "výkonnosti."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -5468,21 +5926,6 @@ msgstr ""
 #~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
 #~ "</imageobject>"
 
-#~ msgid ""
-#~ "<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>"
-#~ 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>"
-
 #~ msgid "With a Bios system"
 #~ msgstr "So systémom BIOS"
 
diff --git a/docs/docs/stable/installer/sl.po b/docs/docs/stable/installer/sl.po
index 5dfd582d..a79a6d08 100644
--- a/docs/docs/stable/installer/sl.po
+++ b/docs/docs/stable/installer/sl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-07-27 22:37+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -30,12 +30,13 @@ msgstr "Licenčna pogodba in opombe ob izdaji"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -68,8 +69,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Za sprejem preprosto označite  <guilabel>Sprejmem</guilabel> in kliknite "
@@ -92,9 +94,10 @@ msgstr "Opombe ob izdaji"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Za to izdajo distribucije <application>Mageia</application> so na voljo "
@@ -102,13 +105,13 @@ msgstr ""
 "izdaji</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "sl"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Izbira virov (nastavitev dodatnih virov namestitve)"
 
@@ -116,46 +119,50 @@ msgstr "Izbira virov (nastavitev dodatnih virov namestitve)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Ta zaslon ponuja seznam že prepoznanih odlagališč paketov. Lahko dodate še "
 "kak drug vir, recimo DVD ali kak oddaljen vir. Ta izbor bo določil kateri "
 "paketi bodo na voljo v naslednjih korakih."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Za omrežni vir je potrebno slediti dvema korakoma:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Izbor in po potrebi aktiviranje omrežja."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Izbor zrcala ali določanje URL-ja (čisto prvi vnos). Z izborom zrcala "
 "pridobite dostop do vseh skladišč, ki jih upravlja skupnost Mageia, Npr. z "
@@ -164,14 +171,15 @@ msgstr ""
 "ali vašo lastno namestitev NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Za posodobitev 64-bitne namestitve, ki lahko vsebuje nekaj 32-bitnih paketov "
 "je priporočljivo tukaj dodati aktivno zrcalo z označenjem enega od omrežnih "
@@ -185,7 +193,7 @@ msgstr "Upravljanje z naprednimi in navadnimi uporabniki"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -198,21 +206,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavite geslo skrbnika (uporabnika root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "V vseh namestitvah <application>Mageje</application> je priporočljivo "
 "nastaviti geslo skrbnika, v Linux-u znan kot <emphasis>geslo root "
@@ -221,32 +229,35 @@ msgstr ""
 "Zaradi preverjanja pravilnosti vnosa morate geslo ponoviti v polju niže."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Vsa gesla so občutljiva na velikost črk. Najbolje je v njem uporabiti "
 "mešanico velikih ter malih črk, številk in posebnih znakov."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Dodajte uporabnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Tukaj dodajte uporabnika. Imel bo manj pravic kot skrbnik (root), a dovolj "
 "za uporabo spleta, pisarniških programov, igranje iger in vse ostalo kar "
 "običajni uporabnik počne z računalnikom."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -255,17 +266,18 @@ msgstr ""
 "oz. sliko uporabnika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
 msgstr "<guilabel>Pravo ime</guilabel>: tukaj vnesite pravo ime uporabnika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Prijavno ime</guilabel>: Tukaj vnesete prijavno ime uporabnika ali "
@@ -273,11 +285,12 @@ msgstr ""
 "<emphasis>Prijavno ime razlikuje med velikostjo črk.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Geslo</guilabel>: Tukaj vnesite uporabniško geslo. Med tipkanjem "
 "gesla v polje se bo barva ščita desno spremenila glede na moč gesla od rdeče "
@@ -285,28 +298,30 @@ msgstr ""
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Geslo (ponovno)</guilabel>: Program drakx preverja pravilnost "
+"<guilabel>Geslo (ponovno)</guilabel>: Program Drakx preverja pravilnost "
 "vnosa, zato morate vnos gesla ponoviti."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Vsak uporabnik, dodan med namestitvijo Mageje, bo imel domačo mapo zaščiteno "
 "tako pred branjem kot tudi pisanjem (umask=0027)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -315,71 +330,51 @@ msgstr ""
 "uporabnikov</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Dovoljenje dostopa lahko spremenite tudi po namestitvi"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Napredno upravljanje z uporabniki"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "S klikom na gumb <guibutton>Napredno</guibutton> lahko urejate nastavitev za "
 "tega dodanega uporabnika."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Dodatno lahko onemogočite ali omogočite prijavo gosta."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Izberite priklopne točke"
 
@@ -396,13 +391,14 @@ msgstr "Izberite priklopne točke"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -412,7 +408,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -420,55 +416,59 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Karkoli spremenite, pazite, da razdelek <literal>/</literal> (koren) ostane."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -690,14 +690,14 @@ msgstr "Izbira namizja"
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -714,13 +714,14 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -741,7 +742,7 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -749,56 +750,60 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Delovna postaja."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Spreminjanje velikosti razdelkov:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Strežnik."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafično okolje."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Izbira posamičnih paketov"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -808,52 +813,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Nastavite vaše storitve"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Tukaj lahko izberete, katere storitve naj se (ali ne) samodejno zaženejo ob "
 "zagonu računalnika"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Izbor, ki ga naredi DrakX, je običajno primeren."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 
@@ -866,12 +871,13 @@ msgstr "Nastavite vaš časovni pas"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -882,15 +888,15 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -901,121 +907,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Izberite strežnik X ()nastavite grafično kartico"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "Proizvajalec"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "ime vaše kartice"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "in tip kartice"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Nastavitev grafične kartice in monitorja"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1024,86 +1025,88 @@ msgstr ""
 "seznama, če je potrebno."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Napačna frekvenca osveževanja lahko poškoduje vaš monitor"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
+"<emphasis><guibutton>Grafična kartica</guibutton></emphasis>: Izberite jo iz "
+"seznama, če je potrebno."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Izberite vaš zaslon"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Po meri</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1112,7 +1115,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1121,61 +1124,62 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Vstavi in poženi</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>prodajalec</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "ime proizvajalca zaslona"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "opis zaslona"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Običajen</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Razdeljevanje diska po meri s programom DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1186,70 +1190,72 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klikni <guibutton>Končano</guibutton> ko bo v redu."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1257,19 +1263,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1282,27 +1288,27 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Razdelitev diska"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1315,43 +1321,43 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Uporabi obstoječe razdelke"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Uporabi razpoložljivi prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Uporabi razpoložljivi prostor v razdelku za Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1359,7 +1365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1370,44 +1376,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Zbriši in uporabi celoten disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Ta možnost bo uporabila celoten pogon za Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1415,12 +1424,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Razdeljevanje diska po meri"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1428,82 +1437,96 @@ msgstr ""
 "S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Spreminjanje velikosti razdelkov:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "Namestitev bo razdelila razpoložljiv prostor po naslednjih pravilih:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Če je vsega razpoložljivega prostora na voljo manj kot 50 GB, bo ustvarjen "
 "samo en razdelek in sicer korenski: /. Brez ločenega domačega razdelka: /"
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Če je vsega razpoložljivega prostora na voljo več kot 50 GB, bodo ustvarjeni "
 "trije razdelki"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "6/19 prostora na voljo bo namenjeno korenskemu: /, a ne več kot 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 bo rezervirana izmenjalnemu razdelku: swap, a največ 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "ostalih (vsaj 12/19) bo uporabljenih za domači razdelek: /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "To pomeni, da bo namestitev pri 160 GB ali več razpoložljivega prostora "
 "ustvarila tri razdelke: 50 GB za korenskega: /, 4 GB za izmenjalnega in "
 "preostalo za domačo mapo: /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1514,7 +1537,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1523,31 +1546,33 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "»Poravnaj z ang.: Align to« »MiB«"
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Prazen prostor spredaj (MiB)\" 2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. type: Content of: <article><info><title>
@@ -1556,7 +1581,7 @@ msgid "Installation from LIVE medium"
 msgstr "Namestitev z Medija Live"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1571,18 +1596,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Uradna dokumentacija za Magejo"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1594,7 +1619,7 @@ msgstr ""
 "org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1606,7 +1631,7 @@ msgstr ""
 "\"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:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1618,13 +1643,13 @@ msgstr ""
 "dokumentiranje</link>, če jih želite izboljšati."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1635,26 +1660,34 @@ msgstr ""
 "Njihov prikaz je odvisen od strojne opreme in vaše izbire med namestitvijo."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Namestitev s programom DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Februar 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1662,7 +1695,7 @@ msgstr "Čestitke"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1671,7 +1704,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1679,26 +1712,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Uživajte"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1712,31 +1745,31 @@ msgstr "Požarni zid"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1747,20 +1780,18 @@ msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;številka-vrat>/&lt;protokol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1768,28 +1799,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatiranje"
 
@@ -1798,14 +1829,14 @@ msgstr "Formatiranje"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1815,35 +1846,35 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -1852,12 +1883,12 @@ msgstr ""
 "nadaljevanje."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, namestitveni program Mageje"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1865,269 +1896,240 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Prikaz dobrodošlice namestitve"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Uporaba Magejinega DVD-ja"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+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><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
-msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+#. 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><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Brez ACPI (vmesnik za napredne nastavitve in upravljanje z energijo) "
 "upravljanje z energijo ni upoštevano"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+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:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Postavitev tipkovnice je sedaj Ameriška"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Namestitveni koraki"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2137,17 +2139,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Težave z namestitvijo in možne rešitve"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Brez grafičnega vmesnika"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2155,22 +2157,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Namestitev zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2180,32 +2184,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Težave s spominom RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dinamični razdelki"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2218,34 +2223,35 @@ msgstr "Posodobitve"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Kliknite <guibutton>Naprej</guibutton> za nadaljevanje"
 
 #. type: Content of: <section><info><title>
@@ -2299,18 +2305,18 @@ msgstr "Izbira virov z lastniško programsko opremo (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2319,14 +2325,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2336,61 +2342,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimalna namestitev"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2400,15 +2406,15 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2426,17 +2432,17 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2451,162 +2457,162 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Sistemske nastavitve"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časovni pas</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Država</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zagonski nalagalnik</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Za več informacij poglejte <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Upravljanje z uporabniki</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Storitve</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Za več informacij poglejte <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Strojne nastavitve"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tipkovnica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Miška</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvočna kartica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafični vmesnik</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "V tem delu lahko nastavljate (eno ali več) grafičnih kartic in zaslonov."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Za več informacij poglejte <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2615,38 +2621,38 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Nastavitve omrežja in interneta"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Omrežje</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Posredniški strežniki</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2654,48 +2660,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Varnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Stopnja varnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Požarni zid</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2703,7 +2709,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -2761,39 +2767,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Stopnja varnosti"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Spreminjanje velikosti razdelkov:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Tukaj lahko prilagodite vašo varnostno stopnjo."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Napredno</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2810,224 +2849,230 @@ msgstr "Predstavitev"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Podrobnosti so podane v naslednjih poglavjih."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Vir"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definicija"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Najdete jih <link ns4:href=\"http://www.mageia.org/sl/downloads/\">tukaj</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Mediji za klasično namestitev"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Skupne značilnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
+msgstr "32 in 64-bitni arhitekturi."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Živi medij"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Vsebuje lastniško programsko opremo."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Živi Plasma DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Samo namizno okolje Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Prisotni so vsi jeziki."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Samo 64-bitna arhitektura."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Živi GNOME DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Samo namizno okolje GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Samo 64-bitna arhitektura"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Živi Xfce DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Samo namizno okolje Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 in 64-bitni arhitekturi."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Medij samo za zagon"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Mediji za klasično namestitev"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "samo angleščina."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3059,9 +3104,9 @@ msgstr "Prejemanje"
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3072,9 +3117,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3084,7 +3129,7 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3093,110 +3138,120 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Zapecite ali prenesite odtis diska"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Odlaganje odtisa nosilca za namestitev na ključek USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Odlaganje odtisa nosilca za namestitev na ključek USB izbriše vse njegove "
 "datotečne sisteme. Navidezna velikost naprave bo omejena na velikost odtisa. "
 "Izgubili boste vse podatke na njem."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3206,94 +3261,99 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Lahko poskusite:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=sl\">Rufus</link> z uporabo "
 "možnosti \"ISO image\" \"ISO slika\" ;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
+"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:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Odprite konzolo"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3335,40 +3395,48 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Vnesite ukaz: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Odstranite ključek USB, ko bo zaključeno"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3397,110 +3465,114 @@ msgstr ""
 #: en/selectCountry.xml:19
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Način vnosa"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Namestitev ali nadgradnja"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Namesti"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Nadgradnja"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: 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 you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3528,28 +3600,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3560,37 +3633,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Izberite jezik namestitve"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3598,23 +3671,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3627,35 +3700,35 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3701,63 +3774,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Glavne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Vmesnik zagonskega nalagalnika"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi za sistem UEFI."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3770,25 +3844,28 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi na sistemu UEFI."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3801,50 +3878,51 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Uporaba Magejinega zagonskega nalagalnika"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -3857,35 +3935,35 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Uporaba obstoječega zagonskega nalagalnika"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -3898,14 +3976,14 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -3914,128 +3992,124 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Možnosti"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Prva stran"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Geslo (ponovno)</guilabel>: Program Drakx preverja pravilnost "
 "vnosa, zato morate vnos gesla ponoviti."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Napredno</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Naslednja stran"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Nastavitev naprav SCSI"
 
@@ -4048,31 +4122,32 @@ msgstr "Nastavitev naprav SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
@@ -4095,8 +4170,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4112,33 +4186,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Napredno"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Potrdi formatiranje trdega diska"
 
@@ -4149,13 +4225,13 @@ msgstr "Potrdi formatiranje trdega diska"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4165,16 +4241,18 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
-msgstr ""
+msgstr "Klikni <guibutton>Končano</guibutton> ko bo v redu."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4283,54 +4361,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Odstrani Magejo"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Navodila"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4371,3 +4444,165 @@ 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 ""
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Geslo (ponovno)</guilabel>: Program drakx preverja pravilnost "
+#~ "vnosa, zato morate vnos gesla ponoviti."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Dodatno lahko onemogočite ali omogočite prijavo gosta."
+
+#~ msgid "Workstation."
+#~ msgstr "Delovna postaja."
+
+#~ msgid "Server."
+#~ msgstr "Strežnik."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafično okolje."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Namestitev bo razdelila razpoložljiv prostor po naslednjih pravilih:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "»Poravnaj z ang.: Align to« »MiB«"
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Prazen prostor spredaj (MiB)\" 2\""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Postavitev tipkovnice je sedaj Ameriška"
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Tukaj lahko prilagodite vašo varnostno stopnjo."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Medij samo za zagon"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Odstranite ključek USB, ko bo zaključeno"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Navodila"
diff --git a/docs/docs/stable/installer/sq.po b/docs/docs/stable/installer/sq.po
index 04198394..e6492032 100644
--- a/docs/docs/stable/installer/sq.po
+++ b/docs/docs/stable/installer/sq.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-01-27 01:30+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -28,12 +28,13 @@ msgstr "Liçenca dhe Shënime Lëshimit"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -67,8 +68,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Për të pranuar, thjesht zgjidhni <guilabel>Prano</guilabel> dhe pastaj "
@@ -91,9 +93,10 @@ msgstr "Shënime lëshimi"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "informacione të rëndësishme janë dhënë për këtë lëshues <application>Mageia</"
@@ -101,13 +104,13 @@ msgstr ""
 " <guibutton>Shënime Lëshimi</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "sq"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Përzgjedhja Media (Konfiguro Plotësues Media Instalimi)"
 
@@ -115,23 +118,25 @@ msgstr "Përzgjedhja Media (Konfiguro Plotësues Media Instalimi)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Ky ekran ju jep listën e Depove të njohura tashmë. Ju mund të shtoni burime "
 "të tjera për paketat, si një disk optik apo një burim të largët. Zgjedhja "
@@ -139,23 +144,25 @@ msgstr ""
 "gjatë hapave të ardhshëm."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Për një burim të rrjetit, ka dy hapa që duhet të ndiqni:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Zgjedhja dhe aktivizimi i rrjetit, nëse nuk bërë tashmë."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Zgjedhjen e një pasqyrë apo një URL të specifikuar (hyrje e parë). Me "
 "zgjedhjen e një pasqyrë, ju keni qasje në zgjedhjen e të gjitha depove të "
@@ -163,14 +170,15 @@ msgstr ""
 "URL, ju mund të caktojë një depo të veçantë ose vet instalimin tuaj NFS."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Nëse ju përditësoni një instalim 64 bit i cili mund të përmbajë disa paketa "
 "32 bit, është këshilluar përdorimi i këtij ekrani për të shtuar një pasqyrë "
@@ -186,7 +194,7 @@ msgstr "Menaxher për Përdorues dhe Super-përdoruesin "
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -200,21 +208,21 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Vendos Fjalëkalim administratori (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Është e këshillueshme për të gjithë instalimet <application>Mageia</"
 "application> për të vendosur një superpërdorues apo fjalëkalim "
@@ -227,9 +235,10 @@ msgstr ""
 "shtypur keq pyetjen fjalëkalimin e parë duke i krahasuar ato."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Të gjitha fjalëkalimet janë raste të ndjeshme, është mirë përdorimi një "
@@ -237,16 +246,18 @@ msgstr ""
 "në një fjalëkalim."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Fut një përdorues"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Shto një përdorues këtu. Një përdorues ka më pak të drejta se super-"
 "përdoruesit (root), por të mjaftueshme për të shfletuar në internet, "
@@ -254,7 +265,7 @@ msgstr ""
 "përdoruesi mesatar bën me kompjuterin e tij"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -263,7 +274,7 @@ msgstr ""
 "ikonën e përdoruesve."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -272,10 +283,11 @@ msgstr ""
 "këtë kuti teksti."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Emri Hyrës</guilabel>: Këtu ju shkruani emrin e përdoruesit hyrës "
@@ -283,11 +295,12 @@ msgstr ""
 "<emphasis>Emri hyrës është rast i ndjeshme.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Fjalëkalimi</guilabel>: Në kutin e tekstit duhet të shkruani "
 "fjalëkalimin e përdoruesit. Është një fushë në fund të kutisë së tekstit çë "
@@ -295,31 +308,31 @@ msgstr ""
 "\"jepFjalëkalim\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Fjalëkalimi (përsëri)</guilabel>: Rishkruaj fjalëkalimin e "
 "përdoruesit në këtë kuti të tekstit dhe DrakX do të kontrollojë ju keni të "
 "njëjtin fjalëkalim në secilën nga kutitë e tekstit përdorues fjalëkalim."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 #, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Çdo përdorues ju shtoni gjatë instalimit Mageia, do të ketë një botë të "
 "lexueshëm (por shkrim i mbrojtur) skedari shtëpi."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 #, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -329,88 +342,60 @@ msgstr ""
 "Zgjidh <emphasis>Menaxhimi Përdoruesit</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Lejet hyrëse gjithashtu mund të ndryshohet pas instalimit."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Menaxhim Përdoruesi Avancuar"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Nëse butoni <guibutton>avancimi</guibutton> klikohet ju do ju ofrohet një "
 "ekran që ju lejon të modifikoni cilësimet për përdoruesin që ju jeni duke "
 "shtuar."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Përveç kësaj, ju mund të çaktivizoni ose aktivizo një llogari mysafir."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Çdo gjë një mysafir e parazgjedhur <emphasis>rbash</emphasis> me llogari "
-"mysafir që ruan në skedarët e tij /shtëpi do të fshihen kur ç'kyçet. "
-"Mysafiri duhet të ruaj skedarët të tij të rëndësishme në një çelës USB."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Aktivizo llogarinë visitor</guilabel>: Këtu ju mund të mundësoni "
-"ose çaktivizoni një llogari visitor.Llogaria visitor lejon një visitor për "
-"të hyrë në dhe të përdorur PC'në, por ai ka qasje më të kufizuar se "
-"përdoruesit normal."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>: Kjo listë ju lejon të ndryshoni shell në "
 "perdorim nga përdoruesi që do shtohet në ekranin e mëparshëm, opsionet janë "
 "Bash, Dash dhe Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Përdorues ID</guilabel>: Këtu ju mund të vendosni ID e përdoruesit "
 "për përdoruesit që ju do shtoni në ekranin e mëparshëm. Ky është një numër. "
 "Lëre bosh nëse nuk e dini se çfarë ju po bëni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grup ID</guilabel>: Kjo ju lejon të vendosni ID'në e grupit. "
-"Gjithashtu një numër, zakonisht i njëjti si të përdoruesit. Lëre bosh nëse "
-"nuk e dini se çfarë ju po bëni."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Zgjidhni pikat montuese"
 
@@ -427,13 +412,14 @@ msgstr "Zgjidhni pikat montuese"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -443,7 +429,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -454,41 +440,45 @@ msgstr ""
 "ndryshojë pikën e montimit."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Nëse ju ndryshoni ndonjë gjë, sigurohuni që ju ende keni një <literal>/</"
 "literal> ndarje (root)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Çdo ndarje është treguar si vijimi: \"Pajisje\" (\"Kapacitet\", \"Pikë "
 "montimi\", \"Tipi\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Pajisja\", është e përbërë nga: \"hard-disku\", [\"numri i hard-diskut"
-"\"(shkronjë)], \"numri ndarjes\" (për shembull, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Nëse ju keni shumë ndarëse, ju mund të zgjidhni pika montuese shumë të "
 "ndryshme nga menyja poshtë, të tilla si <literal>/</literal>, <literal>/"
@@ -498,20 +488,22 @@ msgstr ""
 "<literal>/shtëpi</literal> ndarjet e një instalimi cauldron."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Për ndarëse që ju nuk keni të drejta në, ju mund të lënë pikë fushës "
 "montuese bosh."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Zgjedh<guibutton>Mëparshëm</guibutton> në qoftë se ju nuk jeni të sigurt "
 "çfarë të zgjidhni, dhe pastaj shënoni <guilabel>Ndarja diskut personalizuar</"
@@ -519,7 +511,7 @@ msgstr ""
 "llojin e saj dhe madhësinë."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -754,8 +746,9 @@ msgstr "Përzgjedhje 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 "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Në varësi të zgjedhjes tuaj këtu, ju mund të ju ofrohet ekran i mëtejshme "
@@ -763,8 +756,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -784,14 +778,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Zgjidhni nëse ju preferoni të përdorni <application>KDE</application> ose "
 "<application>Gnome</application> mjedisin desktop. Të dy vijnë me një seri "
@@ -820,8 +816,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -834,24 +831,28 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Stacion-pune."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Mjedis Grafike."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Zgjedhja Individuale Paketave: Ju mund të përdorni këtë opsion për të shtuar "
 "manualisht ose hequr paketa."
@@ -860,37 +861,39 @@ msgstr ""
 #: en/choosePackageGroups.xml:38
 #, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lexo <xref linkend=\"minimal-install\"></xref> për instruksione si për të "
 "bërë një instalim minimal (pa ose me X &amp; IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Zgjidhni paketat individuale"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Këtu ju mund të shtoni ose hiqni çdo paketë shtesë për të rregulluar "
 "instalimin tuaj."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -906,47 +909,45 @@ msgstr ""
 "atë."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfiguro shërbimet tuaja"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Këtu ju mund të vendosni se cilat shërbime (nuk) duhet të fillojnë kur ju "
 "ndezni sistemin tuaj."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Ka katër grupe, klikoni në trekëndësh para se një grup për të zgjeruar atë "
-"dhe të parë të gjitha shërbimet në të."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Cilësimet e zgjedhura nga DrakX zakonisht janë të mira."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -955,7 +956,7 @@ msgstr ""
 "në kutinë info më poshtë."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Vetëm ndrysho gjërat, kur ju e dini shumë mirë se çfarë po bëni."
 
@@ -968,12 +969,13 @@ msgstr "Konfiguro kohën-zonës tuaj"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -983,18 +985,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Zgjidhni kohën e zonës tuaj duke zgjedhur vendin tuaj ose një qytet të afërt "
 "me ju në të njëjtën kohë."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Në ekran tjetër ju mund të zgjidhni vendosjen orës tuaj pjesëve-elektronike "
 "për orën lokale ose në GMT, e njohur edhe si UTC."
@@ -1009,23 +1013,24 @@ msgstr ""
 "se janë të vendosur të gjithë në kohë lokale, ose të gjithë në UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Zgjidhni një X Server (Konfiguro Kartën tuaj Grafike)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1034,7 +1039,7 @@ msgstr ""
 "do të identifikojë saktë pajisjen video tuaj."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1043,37 +1048,30 @@ msgstr ""
 "cilën keni, ju mund të zgjidhni atë nga pema nga:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "shitës"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "atëherë emrin e kartës tuaj"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "dhe lloji i kartës"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Nëse ju nuk mund të gjeni kartën tuaj në listat shitësit (për shkak se ajo "
-"nuk është ende në bazën e të dhënave ose është një kartë të vjetër) ju mund "
-"të gjeni një drejtues të përshtatshme në kategorinë Xorg"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Lista Xorg ofron më shumë se 40 drejtues përgjithshëm dhe të burimit hapur "
 "kartave video. Nëse ju ende nuk mund të gjeni një drejtues për emrin e "
@@ -1081,64 +1079,68 @@ msgstr ""
 "aftësitë themelore."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Të jenë të vetëdijshëm se në qoftë se ju zgjidhni drejtues papajtueshme ju "
 "vetëm mund të kenë të drejtë hyrje në Ndërfaqen Komandave."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Disa prodhues kartë video japin drejtues të pronarit për Linux cilat mund të "
 "jenë në dispozicion vetëm në depo jo-falas dhe në disa raste vetëm nga faqet "
 "e internetit të prodhuesit kartës."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Depoja jo-falas duhet të jenë të aktivizuara në mënyrë eksplicite për të "
 "hyrë në to. Nëse ju nuk e zgjidhni atë më parë, ju duhet të bëni këtë pas "
 "rinisjes tuaj të parë."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Karta Grafike dhe Konfigurimi Monitorit"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Pa marrë parasysh se cili mjedis grafik (e njohur edhe si mjedisi desktop) "
 "ju zgjidhni për këtë instalim i <application>Mageia</application>, ato janë "
@@ -1152,7 +1154,7 @@ msgstr ""
 "është e gabuar."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1161,13 +1163,14 @@ msgstr ""
 "tuaj nga lista nëse është e nevojshme."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: Ju mund të zgjidhni "
 "<guilabel>Plug'n Play</guilabel> kur është e aplikueshme, ose zgjidhni "
@@ -1177,30 +1180,31 @@ msgstr ""
 "tuaj."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Normat e pasakta Rifresko mund të dëmtojë monitoruar tuaj"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Rezolucion</guibutton></emphasis>: Vendos rezolucionin "
 "dhe ngjyra e dëshiruara në thellësinë e monitoruar tuaj këtu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Butoni Test jo gjithmonë "
 "duket gjatë instalimit. Nëse butoni është atje, ju mund të kontrollojë "
@@ -1212,7 +1216,7 @@ msgstr ""
 "sigurt nëse botoni Test nuk është në dispozicion</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1221,12 +1225,12 @@ msgstr ""
 "zgjidhni të mundësoni ose çaktivizoni opsionet e ndryshme."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Zgjidhni Monitorin tuaj"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1235,12 +1239,13 @@ msgstr ""
 "të identifikojë saktë tuajat."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Zgjedhja e një monitori me karakteristika të ndryshme mund të "
 "dëmtojnë monitoruar tuaj ose pjesën-elektronike video. Ju lutem mos provoni "
@@ -1248,23 +1253,23 @@ msgstr ""
 "konsultoheni me dokumentacionin tuaj monitorit"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Personalizuar</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1277,7 +1282,7 @@ msgstr ""
 "shkalla në të cilën linjat skanuara janë shfaqur."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1291,12 +1296,12 @@ msgstr ""
 "monitorit."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Fute 'e Hap</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1305,12 +1310,12 @@ msgstr ""
 "monitorit nga baza e të dhënave monitorëve."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Shitës</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1319,28 +1324,30 @@ msgstr ""
 "cilin ju keni, ju mund të zgjidhni atë nga pema duke përzgjedhur:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "emri i prodhuesit të monitoruar"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "përshkrimi monitorit"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Përgjithshëm</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "zgjedhja e këtij grupi tregon gati 30 konfigurime të ekranit të tilla si "
 "1024x768 @ 60Hz dhe përfshin Panele të sheshtë si laptop të përdorur. Kjo "
@@ -1350,12 +1357,12 @@ msgstr ""
 "konservatore në zgjedhjen tuaj."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ndrysho shpërndarjet e diskut me DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1367,12 +1374,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Në qoftë se ju dëshironi të përdorni kriptim në particionin <literal>/</"
 "literal> tuaj ju duhet të siguroheni që keni një particion të ndarë "
@@ -1380,87 +1389,89 @@ msgstr ""
 "literal> NUK duhet të vendoset, përndryshe sistemi juaj nuk do to ndizet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Shtyrje <guibutton>Pastro T'Gjitha</guibutton> për të fshirë të gjitha "
 "particionet në pajisjen e zgjedhura ruajtëse"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Për të gjitha veprimet e tjera: klikoni mbi ndarjen e dëshiruar të parë. "
 "Pastaj vështro atë, ose zgjidhni një dokumentacion-sistemi dhe një pikë "
 "montimi, ndrysho atë apo fshij atë."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Vazhdoni derisa ju të keni rregulluar gjithçka për dëshirat tuaja."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kliko<guibutton>e Bërë</guibutton> kur ju jeni gati."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1473,29 +1484,30 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Shpërndarja"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Opsionet në dispozicion nga lista e meposhtme do të ndryshojnë në varësi të "
 "veçantë hard disku(t) paraqitjen dhe përmbajtjen."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1508,12 +1520,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Përdor ndarjet ekzistuese"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1522,12 +1534,12 @@ msgstr ""
 "përputhje janë gjetur dhe mund të përdoren për instalimin."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Përdor Hapësirën e Lirë"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1536,12 +1548,12 @@ msgstr ""
 "të përdorë atë për instalimin tuaj të ri Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Përdore Hapësirën e Lirë në Ndarjen Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1550,7 +1562,7 @@ msgstr ""
 "instaluesi mund të ofrojë ta përdorni atë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1561,7 +1573,7 @@ msgstr ""
 "jeni të sigurte që ju keni ruajtur rezervë gjitha dosjet e rëndësishme!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1578,46 +1590,48 @@ msgstr ""
 "e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Fshi dhe të përdor të Gjithë Diskun."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Ky opsion do të përdorin të gjithë diskun për Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Shënim! Kjo do të fshijë të gjitha të dhënat në hard diskun e zgjedhur. "
 "Kujdes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1628,13 +1642,13 @@ msgstr ""
 "atëherë mos e përdorni këtë opsion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "Ndrysho shpërndarjet e diskut me DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1643,73 +1657,85 @@ msgstr ""
 "tuaja."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 #, fuzzy
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Instaluesi do të ndajnë hapsirën në dispozicion në bazë të rregullave të "
-"mëposhtme:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Nëse hapësira totale në dispozicion është më e ulët se 50 GB, vetëm një "
 "ndarje është krijuar për /, nuk ka ndarje të veçantë për /shtëpi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Nëse hapësira totale në dispozicion është mbi 50 GB, pastaj tre ndarëse janë "
 "krijuar"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 e hapësirës totale në dispozicion është ndarë për / me një maksimum "
 "prej 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 është ndarë për swap me një maksimum prej 4GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "pjesa tjetër (të paktën 12/19) është e ndarë për /shtëpi"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Kjo do të thotë se prej 160 GB dhe mbi hapsirën e disponueshme, instaluesi "
 "do të krijojë tre ndarje: 50GB për /, 4 GB për swap dhe pjesa tjetër për /"
 "shtëpi."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 #, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Nëse jeni duke përdorur një sistem UEFI, ESP (EFI Sistemi Ndarja) do të "
 "zbulohet automatikisht, ose krijohet në qoftë se nuk ekziston ende, dhe "
@@ -1717,17 +1743,17 @@ msgstr ""
 "kontrolluar se është bërë në mënyrë korrekte"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1739,7 +1765,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1749,31 +1775,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Radhit në\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Liro hapësirën mësipër (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Gjithashtu sigurohuni që të gjitha ndarëset janë krijuar me një numër çift "
 "në megabajt."
@@ -1784,7 +1813,7 @@ msgid "Installation from LIVE medium"
 msgstr ""
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1799,18 +1828,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Dokumentacioni zyrtar për Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1819,7 +1848,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1831,7 +1860,7 @@ msgstr ""
 "\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1843,13 +1872,13 @@ msgstr ""
 "Dokumentaciont</link>, nëse dëshironi të përmirësoni këtë manual."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1861,26 +1890,34 @@ msgstr ""
 "zgjedhjet që bëni gjatë instalimit."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalim me DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Shkurt 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1888,7 +1925,7 @@ msgstr "Urime"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1899,7 +1936,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1910,16 +1947,17 @@ msgstr ""
 "të rifilloni kompjuterin tuaj."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Pas rifillimit, në ekranin ngarkim-ndezje, ju mund të zgjidhni në mes të "
 "sistemeve operative në kompjuterin tuaj (nëse keni më shumë se një)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1928,12 +1966,12 @@ msgstr ""
 "juaj Mageia do të përzgjidhet automatikisht dhe filloi."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Kënaquni!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1949,31 +1987,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1985,21 +2023,19 @@ msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>Përgjithshëm</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2007,28 +2043,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Ndarjet"
 
@@ -2037,40 +2073,41 @@ msgstr "Ndarjet"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Këtu mund të zgjedhni cilën particion(s) dëshironi të formatoni. Çdo "
 "informacion në particion <emphasis>jo</emphasis> i shënuar për formatim do "
 "të ruhet."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Zakonisht të paktën ndarësja e zgjedhur DrakX duhet të jetë e formatuar"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2079,12 +2116,13 @@ msgstr ""
 "të kontrolloni për të ashtuquajturën  <emphasis>blloqe të këqija</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Nëse ju nuk jeni i sigurt që ju keni bërë zgjedhjen e duhur, ju mund të "
 "klikoni mbi butonin e <guibutton>Mëparshëm</guibutton>, përsëri në "
@@ -2093,7 +2131,7 @@ msgstr ""
 "për të parë atë që është në ndarëse tuaj."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2102,12 +2140,12 @@ msgstr ""
 "guibutton> për të vazhduar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instaluesi Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2118,7 +2156,7 @@ msgstr ""
 "më lehtë të jetë e mundur."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2128,66 +2166,74 @@ msgstr ""
 "keni nevojë."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Pamja Fillestare Instalimit"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "Ç'instalim Mageia "
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Këtu janë ekranet e mirëpritjes të parazgjedhur kur përdorni një DVD Mageia, "
 "i pari me me një sistem trashëgimi dhe i dyti me një sistem UEFI:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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 ""
-"Nga ky ekran i parë, është e mundur për të vendosur disa nga preferencat "
-"personale:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Gjuha (për instalimin e vetëm, mund të jet e ndryshme nga gjuha e zgjedhur "
-"për sistemin), duke shtypur butonin F2 (Vetëm mënyra trashegimi)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2196,41 +2242,26 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Përdorni butonat shigjetë për të zgjedhur gjuhën dhe shtypni butonin Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Këtu është për shembull, ekrani mirëpritës Frengjisht kur duke përdorur një "
-"DVD/CD. Vini re se menyja DVD/CD nuk propozon: <guilabel>Sistemi i "
-"Shpëtimit</guilabel>, <guilabel>Test memorie</guilabel> dhe <guilabel>Vegël "
-"Zbulimi Pjesësh</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Ndrysho rezolucionin e ekranit duke shtypur butonin F3 (Metodë Trashëgimia "
 "vetëm)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2239,64 +2270,62 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Shto disa opsione bërthame duke shtypur butonin<emphasis role=\"bold\">F6</"
-"emphasis> për mënyren trashegimi ose butonin <emphasis role=\"bold\">e</"
-"emphasis> për mënyren UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Parazgjedhur, kjo nuk ndryshon asgjë në opsionet e parazgjedhur."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Nëse instalimi dështon atëherë mund të jetë e nevojshme të provoni përsëri "
-"duke përdorur një nga opsionet shtesë. Menyja e thirrur me F6 shfaq një "
-"linjë e thirrut <guilabel>Opsione ndezëse</guilabel> the propozon katër "
-"hyrje:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Parazgjedhur, kjo nuk ndryshon asgjë në opsionet e parazgjedhur."
+"- Parametra Sigurta, prioritet i është dhënë opsioneve më të sigurta në dëm "
+"të përformancës."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2305,22 +2334,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Shtoni disa opsione kernel duke shtypur butonin F1 (Metodë trashëgimia "
-"vetëm)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2329,16 +2352,16 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2347,88 +2370,63 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Ndihma është përkthyer në gjuhën e zgjedhur me butonin F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr ""
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Hapat e instalimit"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Procesi instalimit është i ndarë në një numër hapash, të cilat mund të "
 "ndiqen në panelin anësor të ekranit."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Secili hap ka një ose më shumë ekrane cili mund të ketë buton "
 "<guibutton>Përparuar</guibutton> me ekstra, më pak zakonisht të kërkuara, "
 "opsionet."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Shumica e ekranëve kanë butonin <guibutton>Ndihmë</guibutton> të cilët japin "
 "shpjegime të mëtejshme në lidhje me hapin e tanishëm."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2448,17 +2446,17 @@ msgstr ""
 "rifilluar."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemet e Instalimit dhe Zgjidhje e Mundshme"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Nuk ka Ndërfaqe Grafike"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2469,22 +2467,24 @@ msgstr ""
 "përdorni rezolutë të ulët duke shtypur <code>vgalo</code> në komandë."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Instaluesi Ngrin"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2499,32 +2499,33 @@ msgstr ""
 "opsione të tjera të nevojshme."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Probleme RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Ndarjet dinamike"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2537,18 +2538,19 @@ msgstr "Përditësime"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2557,10 +2559,11 @@ msgstr ""
 "duhet të ishin përditësime apo përmirësuar."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Zgjidh<guilabel>po</guilabel> nëse ju dëshironi të shkarkoni dhe të "
@@ -2568,8 +2571,9 @@ msgstr ""
 "këtë tani, ose në qoftë se ju nuk jeni të lidhur në internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Pastaj shtyp <guibutton>Tjetër</guibutton> për të vazhduar"
 
 #. type: Content of: <section><info><title>
@@ -2623,18 +2627,19 @@ msgstr ""
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2647,7 +2652,7 @@ msgstr ""
 "gjatë hapave të ardhshëm."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2656,7 +2661,7 @@ msgstr ""
 "bazën e shpërndarjes."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2666,61 +2671,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Instalim Minimal"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2730,15 +2735,16 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2756,17 +2762,17 @@ msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2781,88 +2787,88 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Parametrat e Sistemit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Kohëzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Shteti / Rajoni</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Ngarkues-ndezës</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
+#: en/misc-params.xml:67
 #, 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"
 msgstr ""
 "Mos ndrysho asgjë, nëse nuk keni njohuri se si të konfiguroni Grub dhe/ose "
 "Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Për më shumë informacion, shih <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Menaxhim përdoruesi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Shërbimet</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2871,79 +2877,80 @@ msgstr ""
 "gabim mund të parandoj kompjuterin tuaj së punuari saktë."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Për më shumë informacione, shih <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Parametrat pjesëve-elektronike"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastierë</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Kjo është ajo ku ju vendosni ose ndryshoni paraqitjen e tastierës tuaj e "
 "cila do të varet nga vendndodhja juaj, gjuha ose lloji i tastierës."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Miu</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Karta Zërit</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Ndërfaqe Grafike</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "Ky seksion ju lejon të konfiguroni kartën tuaj grafike(s) dhe ekranin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Për më shumë informacione, shih <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
@@ -2954,40 +2961,41 @@ msgstr ""
 "\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Parametrat rrjeti dhe Interneti"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rrjeti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Kur ju shtoni një kartë e rrjetit, mos harroni të vendosni murin-mbrojtës "
 "tuaj për të parë atë ndërfaqe gjithashtu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2995,50 +3003,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Ju mund të kenë nevojë të konsultoheni me administratorin tuaj të sistemit "
 "për të marrë parametrat që ju duhet për të hyrë këtu"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Siguria"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Niveli Sigurisë</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Kontrolloni opsionin i cili përshtatet më mirë përdorimit tuaj."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Muri-Mbrojtës</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3046,7 +3055,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Të ketë parasysh se duke e lejuar çdo gjë (nuk ka mure-mbrojtës), mund të "
@@ -3107,39 +3116,73 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Niveli Sigurisë"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Ju mund të rregulloni nivelin tuaj të sigurisë këtu."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3156,227 +3199,233 @@ msgstr "Paraqitje"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Përcaktim"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Ju mund ti gjeni <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">këtu</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Ata janë në gjendje të bëjnë një instalim të pastër ose një përditësimi nga "
 "lëshimet e mëparshme."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+msgid "Different media for 32 and 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Ju do ju jepet zgjedhja gjatë instalimit të shtoni programe jo të lirë."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Të gjitha gjuhët janë të pranishëme."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr ""
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "Ç'instalim Mageia "
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Vetëm gjuha angleze."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3409,9 +3458,9 @@ msgstr "Shkarkim"
 #, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Pasi të keni zgjedhur dosjen tuaj ISO, ju mund ta shkarkoni atë duke "
 "përdorur ose http ose BitTorrent. Në të dyja rastet, një dritare ju jep disa "
@@ -3427,9 +3476,9 @@ 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. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -3439,7 +3488,7 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -3448,199 +3497,215 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
+"Shkruani komandën: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
+"bs=1M</userinput>"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Ju mund të provoni:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
+"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:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Hap panel komandimi"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Bëhuni root me komandën <userinput>su -</userinput> (mos harroni '-' në "
 "fund )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Shkruani komandën <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+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."
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3664,44 +3729,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Shkruani komandën: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
 #, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Shembull: # <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
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Shkruani komandën: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3738,112 +3812,125 @@ msgstr ""
 #: en/selectCountry.xml:19
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Metodë hyrëse"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Instalo ose Azhurno"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Instalo"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Përdorni këtë opsion për një instalim të freskët <application>Mageia</"
-"application>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Azhurno"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
+"Nëse diku gjatë instalimit ju vendosni për të ndalur instalimin, është e "
+"mundur për të rifilluar, por ju lutem mendoni dy herë para se të bëni këtë. "
+"Pasi një ndarje është formatuar ose përditësime e reja kanë filluar të "
+"instalohen, kompjuteri juaj nuk është në të njëjtën gjendje dhe rifillimi i "
+"asaj shumë mirë mund të prishet nga ju dhe të jetë një sistem i "
+"papërdorshëm . Nëse, me gjithë këtë ju jeni shumë të sigurt për rifillimin "
+"dhe kjo është ajo që ju doni, shkoni në një terminal tekst duke shtypur tre "
+"çelësat <guibutton>Alt Ctrl F2</guibutton> në të njëjtën kohë. Pas kësaj "
+"shtypni, <guibutton>Ctrl Alt Delete</guibutton> të njëjtën kohë për të "
+"rifilluar."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3868,28 +3955,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tastiera"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3900,37 +3988,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Ju lutemi zgjidhni një gjuhë për të përdorur"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3941,7 +4029,7 @@ msgstr ""
 "përzgjedhje gjatë instalimit dhe për të instaluar sistemin tuaj."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -3952,12 +4040,13 @@ msgstr ""
 "përzgjedhje gjatë instalimit dhe për të instaluar sistemin tuaj."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Nëse është e mundshme që ju do duhen disa gjuhë të instaluar në sistemin "
 "tuaj, për veten apo përdoruesit e tjerë, atëherë ju duhet të përdorni "
@@ -3965,7 +4054,7 @@ msgstr ""
 "jetë e vështirë për të shtuar mbështetje gjuhëve shtesë pas instalimit."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -3978,35 +4067,35 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4052,64 +4141,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Opsionet kryesore të programit Bootloader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 #, fuzzy
 msgid "Bootloader interface"
 msgstr "Opsionet kryesore të programit Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4124,25 +4213,27 @@ msgstr ""
 "\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4155,50 +4246,51 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4211,35 +4303,35 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4252,14 +4344,14 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4267,131 +4359,126 @@ msgid ""
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
 #, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Fjalëkalimi (përsëri)</guilabel>: Rishkruaj fjalëkalimin e "
 "përdoruesit në këtë kuti të tekstit dhe DrakX do të kontrollojë ju keni të "
 "njëjtin fjalëkalim në secilën nga kutitë e tekstit përdorues fjalëkalim."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 #, fuzzy
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Shërbimet</guilabel>:"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr ""
 
@@ -4404,31 +4491,32 @@ msgstr ""
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
@@ -4452,8 +4540,7 @@ msgstr ""
 #: 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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4469,33 +4556,35 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avancuar"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Konfirmo diskun për tu formatuar"
 
@@ -4506,29 +4595,35 @@ msgstr "Konfirmo diskun për tu formatuar"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Kliko në <guibutton>Mëparshëm</guibutton> nëse nuk jeni i sigurt për "
 "zgjedhjen tuaj."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Kliko në <guibutton>Tjetri</guibutton> nëse jeni i sigurt dhe dëshironi të "
 "fshini të gjithë ndarësit, të gjithë sistemet operative dhe të gjithë të "
@@ -4637,16 +4732,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Ç'instalim Mageia "
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Sitë"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Nëse Mageia nuk ju ka bindur ose ju nuk mund ta instaloni atë saktësisht, me "
@@ -4654,28 +4745,28 @@ msgstr ""
 "gjithashtu ju jep mundësinë për të ç'instaluar. Kjo nuk është e vërtetë për "
 "çdo sistem operativ."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -4683,14 +4774,14 @@ msgstr ""
 "Nëse jeni duke përdorur Windows XP, ju mund të krijoni një ndarje të re dhe "
 "ta formatoni atë (FAT32 apo NTFS). Ajo do të marrë një letër ndarje."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4730,6 +4821,287 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Fjalëkalimi (përsëri)</guilabel>: Rishkruaj fjalëkalimin e "
+#~ "përdoruesit në këtë kuti të tekstit dhe DrakX do të kontrollojë ju keni "
+#~ "të njëjtin fjalëkalim në secilën nga kutitë e tekstit përdorues "
+#~ "fjalëkalim."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr ""
+#~ "Përveç kësaj, ju mund të çaktivizoni ose aktivizo një llogari mysafir."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Çdo gjë një mysafir e parazgjedhur <emphasis>rbash</emphasis> me llogari "
+#~ "mysafir që ruan në skedarët e tij /shtëpi do të fshihen kur ç'kyçet. "
+#~ "Mysafiri duhet të ruaj skedarët të tij të rëndësishme në një çelës USB."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Aktivizo llogarinë visitor</guilabel>: Këtu ju mund të "
+#~ "mundësoni ose çaktivizoni një llogari visitor.Llogaria visitor lejon një "
+#~ "visitor për të hyrë në dhe të përdorur PC'në, por ai ka qasje më të "
+#~ "kufizuar se përdoruesit normal."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grup ID</guilabel>: Kjo ju lejon të vendosni ID'në e grupit. "
+#~ "Gjithashtu një numër, zakonisht i njëjti si të përdoruesit. Lëre bosh "
+#~ "nëse nuk e dini se çfarë ju po bëni."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Pajisja\", është e përbërë nga: \"hard-disku\", [\"numri i hard-diskut"
+#~ "\"(shkronjë)], \"numri ndarjes\" (për shembull, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Stacion-pune."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Mjedis Grafike."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Ka katër grupe, klikoni në trekëndësh para se një grup për të zgjeruar "
+#~ "atë dhe të parë të gjitha shërbimet në të."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Nëse ju nuk mund të gjeni kartën tuaj në listat shitësit (për shkak se "
+#~ "ajo nuk është ende në bazën e të dhënave ose është një kartë të vjetër) "
+#~ "ju mund të gjeni një drejtues të përshtatshme në kategorinë Xorg"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Instaluesi do të ndajnë hapsirën në dispozicion në bazë të rregullave të "
+#~ "mëposhtme:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Radhit në\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Liro hapësirën mësipër (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 ""
+#~ "Nga ky ekran i parë, është e mundur për të vendosur disa nga preferencat "
+#~ "personale:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Gjuha (për instalimin e vetëm, mund të jet e ndryshme nga gjuha e "
+#~ "zgjedhur për sistemin), duke shtypur butonin F2 (Vetëm mënyra trashegimi)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Këtu është për shembull, ekrani mirëpritës Frengjisht kur duke përdorur "
+#~ "një DVD/CD. Vini re se menyja DVD/CD nuk propozon: <guilabel>Sistemi i "
+#~ "Shpëtimit</guilabel>, <guilabel>Test memorie</guilabel> dhe "
+#~ "<guilabel>Vegël Zbulimi Pjesësh</guilabel>."
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Shto disa opsione bërthame duke shtypur butonin<emphasis role=\"bold"
+#~ "\">F6</emphasis> për mënyren trashegimi ose butonin <emphasis role=\"bold"
+#~ "\">e</emphasis> për mënyren UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Nëse instalimi dështon atëherë mund të jetë e nevojshme të provoni "
+#~ "përsëri duke përdorur një nga opsionet shtesë. Menyja e thirrur me F6 "
+#~ "shfaq një linjë e thirrut <guilabel>Opsione ndezëse</guilabel> the "
+#~ "propozon katër hyrje:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Shtoni disa opsione kernel duke shtypur butonin F1 (Metodë trashëgimia "
+#~ "vetëm)."
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Ju mund të rregulloni nivelin tuaj të sigurisë këtu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Përdorni këtë opsion për një instalim të freskët <application>Mageia</"
+#~ "application>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Sitë"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -4745,9 +5117,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Personalizuar"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -4758,20 +5127,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Parametra Sigurta, prioritet i është dhënë opsioneve më të sigurta në "
-#~ "dëm të përformancës."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -4980,18 +5335,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
 #~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
 #~ "</imageobject>"
-
-#~ msgid ""
-#~ "<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>"
-#~ 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>"
diff --git a/docs/docs/stable/installer/sv.po b/docs/docs/stable/installer/sv.po
index b9d7ea1f..0dd94588 100644
--- a/docs/docs/stable/installer/sv.po
+++ b/docs/docs/stable/installer/sv.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-27 19:53+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -30,12 +30,13 @@ msgstr "Anteckningar för licens och utgåvan"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -68,8 +69,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "För att acceptera klickar du i <guilabel>Accepterar</guilabel> och sedan på "
@@ -92,9 +94,10 @@ msgstr "Versionsinformation"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Det finns viktig information att läsa om den här utgåvan av "
@@ -102,13 +105,13 @@ msgstr ""
 "knappen <guibutton>Versionsnyheter</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "sv"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Val av media (konfigurera kompletterande installationsmedier)"
 
@@ -116,23 +119,25 @@ msgstr "Val av media (konfigurera kompletterande installationsmedier)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Denna ruta ger dig en lista över redan upptäckta förvaringsplatser. Du kan "
 "lägga till andra källor för paket, till exempel en optisk skiva eller en "
@@ -140,23 +145,25 @@ msgstr ""
 "tillgängliga i nästa steg."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "För en nätverkskälla så finns det två steg att följa:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Val och aktivering av nätverket om det inte redan är uppe."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Val av spegel eller specificera en URL (allra första posten). Genom att "
 "välja en spegel så har du tillgång till urvalet av alla förvaringsplatser "
@@ -165,14 +172,15 @@ msgstr ""
 "installation."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Om du uppgraderar en 64-bitars installation som innehåller 32-bitars paket "
 "bör du använda den här rutan för att lägga till en online-spegel genom att "
@@ -188,7 +196,7 @@ msgstr "Hantering av användare och administratör"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -201,21 +209,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ställ in ett administratörs  (root) -lösenord:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Det är klokt att ange ett administratörslösenord för alla "
 "<application>Mageiainstallationer</application>, vanligtvis kallat "
@@ -226,9 +234,10 @@ msgstr ""
 "jämföra dem så att du inte har skrivit fel."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Alla lösenord skiljer på stora och små bokstäver. Det bästa är att använda "
@@ -236,16 +245,18 @@ msgstr ""
 "lösenord."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Lägg till en användare"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Lägg till en användare här. En användare har färre rättigheter än en "
 "administratör (root), men tillräckligt för att surfa på nätet, använda "
@@ -253,7 +264,7 @@ msgstr ""
 "med sin dator."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -262,7 +273,7 @@ msgstr ""
 "användarens ikon att ändras."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -271,10 +282,11 @@ msgstr ""
 "här fältet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Inloggningsnamn</guilabel>: Här kan du skriva in användarens "
@@ -283,40 +295,42 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Lösenord</guilabel>: I det här textfältet skriver du in "
 "användarens lösenord. Det finns en sköld i slutet av fältet som indikerar "
 "lösenordets styrka. (Se även <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Lösenord (igen)</guilabel>: Skriv lösenordet för användaren igen i "
-"det här textfältet. Drakx kontrollerar att du har angivit samma lösenord i "
-"båda fälten."
+"<guilabel>Lösenord (igen)</guilabel>: Upprepa lösenordet, sedan kommer Drakx "
+"att kontrollera så att det matchar med ovanstående."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "De användare som du lägger till när du installerar Mageia kommer att ha en "
 "hemkatalog med läs och skrivrättigheter (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -324,86 +338,59 @@ msgstr ""
 "emphasis> under installationen. Välj <emphasis>Användarhantering</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Rättigheterna för åtkomst kan också ändras efter installationen."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Avancerad hantering av användare"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Om du klickar på knappen <guibutton>avancerat</guibutton> så kan du redigera "
 "inställningar för den användare du lägger till."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "Du kan även aktivera eller inaktivera ett gästkonto."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Allt som en gäst med ett standard <emphasis>rbash</emphasis>-gästkonto "
-"sparar till sin hemkatalog kommer att raderas när han loggar ut. Gästen bör "
-"spara sina viktiga filer till ett USB-minne"
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Aktivera gästkonto</guilabel>: Här kan du aktivera eller "
-"inaktivera ett gästkonto. Gästkontot tillåter vem som helst att logga in och "
-"använda datorn, men har en mer begränsad tillgång än vanliga användare."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Skal</guilabel>: I den här menyn kan du ändra vilket skal  "
 "användaren ska använda som du lade till i förra rutan. Antingen Bash, Dash "
 "eller Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Användar-ID</guilabel>: Här kan du ange ett ID för användaren du "
 "lade till i förra steget. Det är ett nummer. Lämna tomt om du inte vet vad "
 "du gör."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grupp-ID</guilabel>: Här kan du ange ett grupp-ID. Det är också "
-"ett nummer, vanligtvis samma som för användaren. Lämna tomt om du inte vet "
-"vad du gör."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Välj monteringspunkter"
 
@@ -420,13 +407,14 @@ msgstr "Välj monteringspunkter"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -436,7 +424,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -447,41 +435,45 @@ msgstr ""
 "monteringspunkterna."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Om du ändrar något så var noga med att du fortfarande har en <literal>/</"
 "literal> (root)-partition."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Varje partition visas enligt följande: \"Enhet\" (\"Kapacitet\", "
 "\"Monteringspunkt\", \"Typ\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Enhet\" består av: \"hårddisk\", [\"hårddisknummer \"(bokstav)], "
-"\"partitionsnummer\" (exampelvis, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Om du har många partitioner så kan du välja mellan olika monteringspunkter i "
 "menyn, som t. ex. <literal>/</literal>, <literal>/home</literal> och "
@@ -491,20 +483,22 @@ msgstr ""
 "partition för en Cauldron-installation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "För partitioner som du inte behöver tillgång till kan du lämna fältet för "
 "monteringspunkt tomt."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Välj <guibutton>Tillbaka</guibutton> om du inte är säker på vad du ska "
 "välja, och kryssa i <guilabel>Anpassad diskpartitionering</guilabel>. I "
@@ -512,7 +506,7 @@ msgstr ""
 "storlek."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -775,8 +769,9 @@ msgstr "Val av skrivbordsmiljö"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Beroende på vad du väljer här så kan det finnas fler steg för att finjustera "
@@ -784,8 +779,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -804,14 +800,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Välj antingen <application>KDE</application> eller <application>Gnome</"
 "application> som skrivbordsmiljö beroende på vilken du tycker om. Bägge "
@@ -838,8 +836,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -850,61 +849,68 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Arbetsstation."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Hantera partitionsstorlek:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Server."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafisk miljö."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Individuellt paketval: Du kan använda det här alternativet för att manuellt "
 "lägga till eller ta bort paket."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Läs igenom <xref linkend=\"minimal-install\"/> för anvisningar om hur du "
 "utför en minimal installation, med eller utan X &amp; IceWM."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Välj individuella paket"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Här kan du lägga till eller ta bort paket för att anpassa din installation."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -919,54 +925,52 @@ msgstr ""
 "knapp under installationen och välja att ladda den."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Konfigurera dina tjänster"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Här ställer du in vilka tjänster som (inte) ska starta när du startar ditt "
 "system."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Det finns fyra grupper. Klicka på triangeln intill en grupp för att "
-"expandera och se alla tjänster som den innehåller."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Inställningar som DrakX väljer är oftast bra."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr "Om du markerar en tjänst så visas viss information i inforutan nedan."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Ändra bara på saker när du vet mycket väl vad du gör."
 
@@ -979,12 +983,13 @@ msgstr "Ställ in din tidszon"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -994,18 +999,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Välj din tidszon genom att välja ditt land eller en stad nära dig i samma "
 "tidszon."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "På nästa skärm kan du välja att ställa in din hårdvaruklocka till lokal tid "
 "eller till GMT, även kallad UTC."
@@ -1020,23 +1027,23 @@ msgstr ""
 "inställda på lokal tid eller till UTC/GMT."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Välj en X-server (konfigurera ditt grafikkort)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1045,7 +1052,7 @@ msgstr ""
 "oftast ditt nuvarande grafikkort korrekt."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1054,37 +1061,30 @@ msgstr ""
 "vilket du har så kan du välja det från trädet genom:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "tillverkare"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "sedan namnet på ditt kort"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "och typ av kort"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Om du inte kan hitta ditt kort i listan över tillverkare (för att det ännu "
-"inte finns i databasen eller att det är ett äldre kort) så kan du hitta en "
-"passande drivrutin i Xorg-kategorin"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg-listan erbjuder mer än 40 grafikkortsdrivrutiner med öppen källkod. Om "
 "du fortfarande inte kan hitta en namngiven drivrutin för ditt kort så finns "
@@ -1092,63 +1092,67 @@ msgstr ""
 "funktionaliteter."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Tänk på att om du väljer en drivrutin som inte passar så kommer du kanske "
 "enbart att ha tillgång till det textbaserade gränssnittet."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "En del grafikkortstillverkare tillhandahåller patenterade drivrutiner för "
 "Linux vilket enbart finns tillgängligt i NonFree-medierna, och i vissa fall "
 "enbart från tillverkarens hemsida."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree-medierna måste aktiveras för att få tillgång till dem. Du borde göra "
 "detta efter din första omstart."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Konfigurera grafikkort och bildskärm"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Oavsett vilket grafisk miljö (även kallad skrivbordsmiljö) du väljer för den "
 "här installationen av <application>Mageia</application>, så baseras alla på "
@@ -1160,7 +1164,7 @@ msgstr ""
 "inte gjorde något val, eller om du tror att valet är inkorrekt."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1169,13 +1173,14 @@ msgstr ""
 "listan om det behövs."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Skärm</guibutton></emphasis>: Du kan välja "
 "<guilabel>Plug'n Play</guilabel> när det passar, eller välj din skärm från "
@@ -1184,30 +1189,31 @@ msgstr ""
 "ange de horisontella och vertikala uppdateringsfrekvenserna för din skärm."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Inkorrekta uppdateringsfrekvenser kan skada din skärm"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Upplösning</guibutton></emphasis>: Ange önskad "
 "upplösning och färgdjup för din skärm här."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: Testknappen visas inte "
 "alltid under installationen. Om knappen finns där så kan du kontrollera dina "
@@ -1219,7 +1225,7 @@ msgstr ""
 "sidan om testknappen inte är tillgänglig</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1228,12 +1234,12 @@ msgstr ""
 "aktivera eller inaktivera olika alternativ."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Att välja din bildskärm"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1242,12 +1248,13 @@ msgstr ""
 "identifiera ditt nuvarande grafikkort rätt."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Att välja en bildskärm med annorlunda egenskaper kan skada din "
 "bildskärm eller videohårdvara. Försök inte att prova något om du inte vet "
@@ -1255,23 +1262,23 @@ msgstr ""
 "följde med din bildskärm."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Anpassad</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1285,7 +1292,7 @@ msgstr ""
 "visas."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1298,12 +1305,12 @@ msgstr ""
 "läs dokumentationen för din bildskärm."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1312,12 +1319,12 @@ msgstr ""
 "över bildskärmar."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Tillverkare</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1326,28 +1333,30 @@ msgstr ""
 "så kan du välja den från trädet genom att välja:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "Bildskärmstillverkarens namn"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "bildskärmens beskrivning"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Standard</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "vid val av denna grupp så visas uppemot 30 bildskärmskonfigureringar som t. "
 "ex. 1024x768 @ 60Hz och inkluderar även plattskärmar som används i bärbara "
@@ -1356,12 +1365,12 @@ msgstr ""
 "gång så är det klokt att vara försiktig med dina val."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Anpassad diskpartionering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1372,12 +1381,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Om du vill använda kryptering på din <literal>/</literal>-partition så måste "
 "du se till att ha en separat <literal>/boot</literal>-partition. "
@@ -1385,71 +1396,73 @@ msgstr ""
 "ställas in, annars kommer detta göra ditt system omöjligt att boota."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Här kan du justera layouten på dina hårddiskar. Du kan radera eller skapa "
 "partitioner, ändra filsystem och storlek. Du kan även titta vad som finns på "
 "dem innan du startar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Det finns en flik för varje hårddisk eller annan lagringsenhet som har "
-"hittats, t. ex ett USB-minne. Det finns sda, sdb och sdc om där är tre "
-"stycken."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Tryck på <guibutton>Rensa allt</guibutton> för att tömma alla partitioner på "
 "den valda lagringsenheten"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "Fortsätt tills du har justerat allt enligt dina önskemål."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klicka på <guibutton>Klar</guibutton> när du är redo."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Om du installerar Mageia på ett UEFI-system, kontrollera att en ESP (EFI -"
 "systempartition) är närvarande och korrekt monterad på /boot/EFI (se nedan)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1457,12 +1470,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1471,7 +1484,7 @@ msgstr ""
 "ett Legacy/GPT-system"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1484,32 +1497,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "På den här sidan ser du innehållet på dina hårddiskar och hur "
 "partitionsguiden i DrakX har hittat förslag på var <application>Mageia</"
 "application> kan installeras."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Alternativen som är tillgängliga i listan nedan varierar beroende på "
 "layouten och innehållet på din(a) hårddisk(ar)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1522,12 +1537,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Använd existerande partitioner"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1536,12 +1551,12 @@ msgstr ""
 "hittats och kan användas för installation."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Använd ledigt utrymme"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1550,12 +1565,12 @@ msgstr ""
 "använda det för att installera Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Använd ledigt utrymme på en Windows-partition"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1564,7 +1579,7 @@ msgstr ""
 "dig möjlighet att använda det."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1575,7 +1590,7 @@ msgstr ""
 "har säkerhetskopierat alla viktiga filer!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1591,12 +1606,14 @@ msgstr ""
 "användas. Du rekommenderas starkt att säkerhetskopiera dina personliga filer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Med det här alternativet visar installationsprogrammet den resterande "
 "Windows-partitionen i ljusblått och den framtida Mageia-partitionen i "
@@ -1605,37 +1622,39 @@ msgstr ""
 "nedan."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Radera och använd hela hårddisken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Det här alternativet kommer att använda hela disken för Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Tänk på att detta kommer att ta radera ALL data på den valda hårddisken. Var "
 "försiktig!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1646,12 +1665,12 @@ msgstr ""
 "ska du inte använda detta alternativ."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Anpassad diskpartitionering"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1660,83 +1679,95 @@ msgstr ""
 "a disk/ar."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Hantera partitionsstorlek:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Installationsprogrammet kommer att dela på tillgängligt utrymme enligt "
-"följande regler:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Om det totala lediga utrymmet är under 50GB så kommer endast en partition "
 "att skapas för /. Det finns ingen separat partition för /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Om det totala utrymmet är mer än 50GB så kommer tre partitioner att skapas"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 av det totala lediga utrymmet fördelas till / med ett maximum av 50GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 är allokerat till swap med en gräns på 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "resten (minst 12/19) förledas till /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Det betyder att från 160GB och uppåt med ledigt utrymme kommer "
 "installationsprogrammet att skapa tre partitioner: 50GB för /, 4GB för swap "
 "och resten till /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1747,7 +1778,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1756,15 +1787,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "En del nyare diskar använder nu 4096 bytes logiska sektorer istället för den "
 "föregående standarden med 512 bytes. På grund av brist på tillgänglig "
@@ -1775,19 +1807,22 @@ msgstr ""
 "följande inställningar:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"Rikta mot\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Ledigt utrymme före (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Se också till att alla partitioner skapas med ett jämnt antal megabyte."
 
@@ -1797,7 +1832,7 @@ msgid "Installation from LIVE medium"
 msgstr "Installation från ett LIVE-media"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1812,17 +1847,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageias officiella dokumentation"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1834,7 +1870,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1846,7 +1882,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1858,13 +1894,13 @@ msgstr ""
 "link> om du vill hjälpa till och förbättra den här manualen."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1876,26 +1912,34 @@ msgstr ""
 "och vilka val du gör under installationen."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation med DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "februari 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1903,7 +1947,7 @@ msgstr "Grattis"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1912,7 +1956,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1923,16 +1967,17 @@ msgstr ""
 "din dator."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Efter omstarten så kan du välja mellan operativsystemen i din dator (om du "
 "har mer än ett) i starthanteraren."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1941,12 +1986,12 @@ msgstr ""
 "väljas och starta automatiskt."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Njut!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1962,31 +2007,31 @@ msgstr "Brandvägg"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1997,20 +2042,18 @@ msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;portnummer>/&lt;protokoll></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2018,28 +2061,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Formatering"
 
@@ -2048,14 +2091,14 @@ msgstr "Formatering"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2065,24 +2108,25 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Här kan du välja vilken/a partition/er som du vill formatera. All data på "
 "partitionerna <emphasis>som inte</emphasis>är markerat för formatering "
 "kommer att sparas."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Vanligtvis behöver i alla fall de partitioner som DrakX har valt att "
 "formateras."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2091,12 +2135,13 @@ msgstr ""
 "som du vill kontrollera efter så kallade <emphasis>dåliga block</emphasis>"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Om du är osäker på om du valt rätt så kan du klicka på  "
 "<guibutton>Föregående</guibutton>, och på <guibutton>Föregående</guibutton> "
@@ -2104,7 +2149,7 @@ msgstr ""
 "till huvudsidan. Där kan du välja och se vad som finns på dina partitioner."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2113,12 +2158,12 @@ msgstr ""
 "fortsätta."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageias installerare"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2129,7 +2174,7 @@ msgstr ""
 "enkel som möjligt."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2138,146 +2183,141 @@ msgstr ""
 "installationsprogrammet som i normalfallet är allt du behöver."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Välkomstskärm för installationen"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Använder en Mageia DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
+#: 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:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"Språk (endast för installation, det kan vara annorlunda än det valda språket "
-"för systemet) genom att trycka på F2 (endast legacy-läge)"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr "Använd piltangenterna för att välja språk och tryck på Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Här är t. ex. den franska välkomstskärmen vid användning av en Live DVD/CD. "
-"Observera att menyn på en Live DVD/CD inte föreslår: <guilabel>Rescue "
-"System</guilabel>, <guilabel>Memory Test</guilabel> och <guilabel>Hardware "
-"Detection Tool</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "Ändra skärmupplösning genom att trycka på F3 (endast legacy-läge)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Lägg till kernel-alternativ genom att trycka på <emphasis role=\"bold\">F6</"
-"emphasis> i legacy-läge, eller <emphasis role=\"bold\">e</emphasis> för UEFI-"
-"läge."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Standard, det ändrar inget i standardalternativen."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Om installationen misslyckas kan det bli nödvändigt att försöka igen genom "
-"att använda några extra alternativ. Tryck på F6 för att få fram en meny som "
-"visar en ny rad kallad <guilabel>Boot options</guilabel> och föreslå fyra "
-"poster:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Standard, det ändrar inget i standardalternativen."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- Ingen ACPI (Advanced Configuration and Power Interface), strömhantering "
 "beaktas."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Ingen lokal APIC (Local Advanced Programmable Interrupt Controller), det "
 "handlar om CPU-avbrott, välj detta alternativ om du blir tillfrågad."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2286,51 +2326,48 @@ msgstr ""
 "standardalternativen som visas på <guilabel>Boot Options</guilabel>-raden."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "I vissa utgåvor av Mageia kan det hända att posterna som valts i menyn med "
 "F6 inte visas på raden <guilabel>Boot Options</guilabel>, men de beaktas "
 "dock ändå."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Lägg till fler kernel-alternativ genom att trycka på F1 (endast legacy-läge)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Detaljerad översikt för alternativet splash. Tryck på Esc eller välj "
 "<guilabel>Tillbaka till Boot Options</guilabel> för att gå tillbaka till "
@@ -2338,19 +2375,22 @@ msgstr ""
 "med <guilabel>Boot Options</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Hjälpen är översatt i det valda språket med tangenten F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2360,78 +2400,47 @@ msgstr ""
 "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><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Använder ett trådburet nätverk"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Det tillåter inte ändringar i språket, tillgängliga alternativ finns "
-"beskrivna på skärmen. För mer information hur man använder en trådburen "
-"nätverksbaserad installations-CD, se <link ns2:href=\"https://wiki.mageia."
-"org/en/Boot.iso_install\">Mageias Wiki</link>"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Tangentbordslayouten är amerikansk."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Installationsstegen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Installationsprocessen är indelad i ett antal steg som kan följas i "
 "sidopanelen på skärmen."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Varje steg har en eller flera sidor som också kan ha  <guibutton>Avancerat</"
 "guibutton>-knappar med mer, men sällan krävande alternativ."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "De flesta rutor har <guibutton>Hjälp</guibutton>-knappar som ger ytterligare "
 "information om det aktuella steget."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2450,17 +2459,17 @@ msgstr ""
 "om."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsproblem och möjliga lösningar"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Inget grafiskt gränssnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2471,13 +2480,16 @@ msgstr ""
 "skriva <code>vgalo</code> vid prompten."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "En grafisk installation kanske inte är möjlig om hårdvaran är väldigt "
 "gammal. I sådana fall kan det vara värt att prova en textbaserad "
@@ -2487,12 +2499,12 @@ msgstr ""
 "installationen i textläge."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Installationen hänger sig"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2507,14 +2519,15 @@ msgstr ""
 "alternativ om nödvändigt."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM-problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2525,18 +2538,20 @@ msgstr ""
 "ex. <code>mem=256M</code> anger 256MB RAM."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dynamiska partitioner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Om du har konverterat din hårddisk från grundläggande till dynamiskt format "
 "i Microsoft Windows så är det omöjligt att installera Mageia på den disken. "
@@ -2554,18 +2569,18 @@ msgstr "Uppdateringar"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2574,10 +2589,11 @@ msgstr ""
 "kommer några paket ha blivit uppdaterade eller förbättrade."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Välj <guilabel>ja</guilabel> om du vill ladda ner och installera dem. Välj "
@@ -2585,8 +2601,9 @@ msgstr ""
 "ansluten till internet"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Tryck sedan på <guibutton>Nästa</guibutton> för att fortsätta"
 
 #. type: Content of: <section><info><title>
@@ -2644,18 +2661,18 @@ msgstr "Val av media (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2668,7 +2685,7 @@ msgstr ""
 "nästkommande steg."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2677,7 +2694,7 @@ msgstr ""
 "innehåller basen för distributionen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2692,13 +2709,14 @@ msgstr ""
 "även firmware till olika WiFi-kort."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "<emphasis>Tainted</emphasis>-arkivet innehåller paket som är släppt under en "
 "fri licens. Huvudsakliga kriterier för att placera paket i denna "
@@ -2708,35 +2726,38 @@ msgstr ""
 "video med mera."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Minimal installation"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Du kan välja en minimal installation genom att avmarkera allt på sidan för "
 "paketval, se <xref linkend=\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr "Om så önskas kan du välja till \"individuella paket\" på samma skärm."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "En minimal installation är ämnad för dem som har speciella behov för sin "
 "<application>Mageia</application>, som t. ex. en server eller en "
@@ -2746,25 +2767,24 @@ msgstr ""
 "\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Om du väljer denna installationsklass kommer en relaterad skärm att erbjuda "
 "dig några användbara extrapaket att installera så som dokumentation och X."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Om \"Med X\" är valt så kommer även IceVM inkluderas som en lätt "
-"skrivbordsmiljö."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2778,15 +2798,15 @@ msgstr ""
 "www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> info-sidor."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2803,11 +2823,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX har gjort smarta val för att konfigurera ditt system beroende på de "
 "val som du har gjort och på hårdvaran som DrakX har hittat. Du kan "
@@ -2817,8 +2838,8 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2833,71 +2854,74 @@ msgstr "standardinställningen har redan provats men misslyckades"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Systemparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Tidszon</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX har valt en tidszon åt dig som passar med det språk du valt. Du kan "
 "ändra den om det behövs. Läs även <xref linkend=\"configureTimezoneUTC\"></"
 "xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Om du inte är i det valda landet så är det väldigt viktigt att du rättar "
 "till inställningen. Läs <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Starthanterare</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX har gjort bra val för hur startladdaren är inställd."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Ändra ingenting om du inte vet hur man konfigurerar Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "För mer information, läs <xref linkend=\"setupBootloader\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Användarhantering</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2906,21 +2930,22 @@ msgstr ""
 "<literal>/home</literal>-katalog."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Tjänster</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Systemtjänster refererar till de småprogram som kör bakgrundsdemonerna. Med "
 "det här verktyget kan du aktivera eller inaktivera vissa uppgifter."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2929,31 +2954,32 @@ msgstr ""
 "dator inte fungerar korrekt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "För mer information, se <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Hårdvaruparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tangentbord</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Det är här som du ställer in eller ändrar din tangentbordslayout som baseras "
 "på var du befinner dig, språk eller typ av tangentbord."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -2962,12 +2988,12 @@ msgstr ""
 "kommer lösenorden också att ändras."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2976,38 +3002,39 @@ msgstr ""
 "etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Ljudkort</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Installationsprogrammet använder en standard drivrutin om en sådan finns. "
 "Möjligheten att välja en annan ges bara när det finns mer än en drivrutin "
 "för ditt ljudkort men där ingen av dem är standard."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafiskt gränssnitt</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "I det här avsnittet kan du konfigurera ditt grafikkort och bildskärm."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "För mer information, läs <xref linkend=\"configureX_chooser\"></xref>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3016,20 +3043,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Nätverk och Internetparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Nätverk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3039,21 +3067,22 @@ msgstr ""
 "aktiverat Nonfree-medierna."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Glöm inte att ställa in din brandvägg att övervaka när du lägger till ett "
 "nätverkskort."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxyservrar</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3063,26 +3092,27 @@ msgstr ""
 "här sektionen kan du konfigurera din dator för att utnyttja en proxytjänst."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Du kan behöva rådfråga din systemadministratör för att få parametrarna som "
 "du behöver ange här"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Säkerhet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Säkerhetsnivå</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3091,17 +3121,17 @@ msgstr ""
 "standardinställningen (Standard) tillräcklig för normalt användande."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Kontrollera vilket val som passar dig bäst."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Brandvägg</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3110,7 +3140,7 @@ msgstr ""
 "och alla rackare ute på nätet som skulle försöka ta över eller stjäla den."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3121,7 +3151,7 @@ msgstr ""
 "linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Tänk på att om du tillåter allt (ingen brandvägg) så tar du en stor risk."
@@ -3187,40 +3217,73 @@ msgstr ""
 "utrymme så att <application>Mageia</application> kan installeras."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Säkerhetsnivå"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Hantera partitionsstorlek:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Här kan du justera din säkerhetsnivå."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Avancerat</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Om du inte vet vad du ska välja så lämna standardinställningarna som de är."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Efter installationen så kommer det alltid att finnas möjlighet att justera "
 "dina säkerhetsinställningar i <guilabel>Säkerhets</guilabel>-delen i Mageias "
@@ -3238,25 +3301,27 @@ msgstr "Presentation"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia distribueras via ISO-avbilder. Den här sidan kommer att hjälpa dig "
 "att välja den avbild som passar dina behov bäst."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Det finns två media-familjer:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klassisk installation: Efter att du startat från mediet kommer du att gå "
 "igenom ett process där du kan välja vad som ska installeras och hur du "
@@ -3265,82 +3330,86 @@ msgstr ""
 "du vill installera."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"LIVE media: Du kan starta mediet i ett äkta Mageia-system utan att "
-"installera det för att se hur det ser ut efter installation. Installationen "
-"är sedan lättare men du har färre val."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Detaljer följer i nästkommande avsnitt."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Definition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Här är ett medium (plural: media) en ISO-avbild som du kan använda för att "
 "installera och/eller uppgradera Mageia till den fysiska hårdvaran som ISO-"
 "filen kopieras till."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Du hittar dem <link ns4:href=\"http://www.mageia.org/en/downloads/\">här</"
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klassiska installtionsmedier"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Vanliga funktioner"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "De här ISO-filerna använder den traditionella installeraren, drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "De kan utföra en ren installation eller uppgradera från en tidigare version."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Olika media för 32 eller 64-bitars arkitekturer."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3349,12 +3418,12 @@ msgstr ""
 "minnestest och identifiering av hårdvara."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Varje DVD innehåller många skrivbordsmiljöer och språk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3362,100 +3431,105 @@ msgstr ""
 "programvara."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Kan användas för att förhandsgranska distributionen utan att installera den "
 "på en hårddisk, och eventuellt installera den."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live ISO-filer kan endast användas för en ren "
 "installation, de kan inte användas för att uppgradera från en tidigare "
 "version.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "De innehåller icke-fri mjukvara."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Endast skrivbordsmiljön Plasma."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Alla språk finns med."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Endast 64-bitars plattform."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Endast skrivbordsmiljön GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Endast 64-bitars plattform."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Endast skrivbordsmiljön Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 eller 64-bitars plattform."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Endast bootbar CD-media"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3466,28 +3540,30 @@ msgstr ""
 "kan ligga på datorns hårddisk, på ett nätverk eller Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Dessa media är väldigt små (mindre än 100MB) och är användbara när "
 "bandbredden är för låg för att ladda ner en hel DVD, en PC utan DVD-spelare "
 "eller en PC som inte kan starta från ett USB-minne."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Endast på engelska."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3521,11 +3597,12 @@ msgstr "Hämtar"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Efter att du valt din ISO-fil så kan du ladda ner den via antingen http "
 "eller BitTorrent. I båda fallen visas ett fönster med information som t. ex. "
@@ -3539,10 +3616,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum och sha1sum är verktyg som används för att kontrollera ISO-filens "
 "integritet. Använd bara en av dom, och behåll den <link linkend=\"integrity"
@@ -3555,8 +3633,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Markera knappen Spara fil."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3564,14 +3642,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Kontrollerar integriteten på nerladdad media"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Båda kontrollsummorna är hexadecimala nummer som räknas ut av en algoritm "
 "från filen som ska laddas ner. När du räknar om dessa från numret från din "
@@ -3580,69 +3659,84 @@ msgstr ""
 "ladda ner den igen eller göra en kontroll via BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "Öppna en konsol, behöver inte vara root, och:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- För att använda md5sum, skriv: [sam@localhost]$ <userinput>md5sum sökväg/"
 "till/avbilden/fil.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- För att använda sha1sum, skriv: [sam@localhost]$ <userinput>sha1sum sökväg/"
 "till/avbilden/fil.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"och jämför erhållet nummer från din dator (du kanske måste vänta ett tag) "
-"med det nummer som Mageia har försett. Exempel:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"och jämför erhållet nummer från din dator (du kanske måste vänta ett tag) "
+"med det nummer som Mageia har försett. Exempel:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Bränn eller dumpa ISO-filen."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Den kontrollerade ISOn kan nu brännas på en CD eller DVD, eller dumpas på "
 "ett USB-minne. Det är inte en vanlig kopiering utan ämnar att skapa ett "
 "startbart media."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Att bränna ISO-filen till en CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Använd vilken brännare du vill men se till att den är inställd att bränna "
 "<emphasis role=\"bold\">en avbild</emphasis>, att bränna data eller filer är "
@@ -3650,12 +3744,12 @@ msgstr ""
 "org/en/Writing_CD_and_DVD_images\">Mageias wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Dumpa ISOn till ett USB-minne"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3664,18 +3758,19 @@ msgstr ""
 "minne och sedan använda det för att starta och installera systemet."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Att \"dumpa\" en avbild på ett USB-minne förstör det filsystem som finns på "
 "enheten. All data kommer att gå förlorad och partitionens storlek blir "
 "reducerad till avbildens storlek."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3684,12 +3779,12 @@ msgstr ""
 "formatera om USB-enheten."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Använda ett grafiskt verktyg i Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3698,73 +3793,72 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Använda ett grafiskt verktyg i Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Du kan prova:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
 "användning av \"ISO image\"-alternativet;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Använda kommandoraden i ett GNU/Linux-system"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Det är potentiellt *farligt* att göra detta för hand. Du riskerar att skriva "
 "över en hårddiskpartition om du anger fel enhets-ID."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Du kan även använda verktyget dd i en konsol:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Öppna en konsol"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Bli root med följande kommando: <userinput>su -</userinput> (glöm inte '-' i "
 "slutet)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3773,28 +3867,40 @@ msgstr ""
 "filhanterare som kan läsa det)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Skriv kommandot <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Leta upp enhetsnamnet för din USB-sticka (genom dess storlek), t. ex. <code>/"
+"dev/sdb</code> i skärmdumpen ovan är ett USB-minne på 8GB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Alternativt kan du ta reda på enhetsnamnet med kommandot <code>dmesg</code>: "
 "I slutet kan du se namn som börjar med <emphasis>sd</emphasis>, och "
 "<emphasis>sdd</emphasis>. I det här fallet:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3836,46 +3942,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Leta upp enhetsnamnet för din USB-sticka (genom dess storlek), t. ex. <code>/"
-"dev/sdb</code> i skärmdumpen ovan är ett USB-minne på 8GB."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Skriv kommandot: # <userinput>dd if=sökväg/till/ISO-filen of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "Där X=din enhets namn t. ex. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Exempel: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Skriv kommandot: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Koppla från ditt USB-minne och sedan är allt klart."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3905,19 +4020,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Om ditt land inte finns i listan så klicka på knappen <guilabel>Andra "
 "länder</guilabel> och välj ditt land / region där."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Om ditt land enbart finns i listan över <guilabel>Andra länder</guilabel> "
@@ -3926,83 +4043,83 @@ msgstr ""
 "riktiga val så ignorera detta."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Inmatningsmetod"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Om du missade inmatningsmetoden under installationen så kan du tillgå den "
 "efteråt genom att gå till \"Konfigurera din dator\" -> \"System\", eller att "
 "köra localedrake som root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Installation eller uppgradering"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Installera"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Välj det här alternativet för en ren <application>Mageia</application>-"
-"installation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Uppgradera"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Om du har en eller flera <application>Mageia</application>-installationer i "
-"ditt system kan du med installationsprogrammet uppgradera en av dem till den "
-"senaste utgåvan."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Endast uppgraderingar från en tidigare Mageiaversion som "
 "<emphasis>fortfarande hade support</emphasis> när installationen släpptes "
@@ -4011,16 +4128,17 @@ msgstr ""
 "installation, medans du bevarar din <literal>/home</literal>-partition."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Om du under installationen bestämmer dig för att stoppa installationen så är "
 "det möjligt, men tänk dig för innan du gör det. När en partition väl blivit "
@@ -4032,12 +4150,14 @@ msgstr ""
 "guibutton> samtidigt för att starta om."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Om du glömde att välja ytterligare språk kan du gå tillbaka till skärmen "
 "\"Installera eller uppgradera\" och välja språk genom att trycka ner "
@@ -4071,12 +4191,12 @@ msgstr ""
 "Standard är satt beroende på vilket språk och tidszon du valt i förra steget."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Tangentbord"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4085,16 +4205,17 @@ msgstr ""
 "väljer den ett tangentbord med amerikansk layout."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4112,23 +4233,25 @@ msgstr ""
 "Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Om ditt tangentbord inte finns i nedanstående lista, klicka på "
 "<guibutton>Fler</guibutton> för att få en fullständig lista och välj ditt "
 "tangentbord där."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Efter att ha valt ett tangentbord från dialogrutan <guibutton>Mer</"
 "guibutton>, kommer du att återgå till det första valet för tangentbord och "
@@ -4137,23 +4260,24 @@ msgstr ""
 "tangentbord är det du valde i den stora listan."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Om du väljer ett tangentbord som baseras på icke-latinska tecken så visasen "
 "extra dialogruta som frågar dig hur du föredrar att byta mellan latin och "
 "icke-latinsk tangentbordslayout"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Välj språk"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4164,7 +4288,7 @@ msgstr ""
 "valet under installationen och till ditt installerade system."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4173,12 +4297,13 @@ msgstr ""
 "språket under installationen och i ditt installerade system."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Om du skulle behöva använda flera språk i ditt system, antingen för dig "
 "själv eller för andra användare så bör du klicka på <guibutton>fler språk</"
@@ -4186,7 +4311,7 @@ msgstr ""
 "språkstöd efter installationen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4199,18 +4324,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Även om du väljer mer än ett språk så måste du först välja ett som du "
 "föredrar i den första språkrutan. Det kommer också att bli märkt som valt i "
 "rutan för flera språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4219,23 +4345,24 @@ msgstr ""
 "även installera språket för ditt tangetbord."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia använder UTF-8 (Unicode)-stöd som standard."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Detta kan inaktiveras i skärmen för \"flera språk\" om du vet att det inte "
 "är aktuellt för ditt språk. Att inaktivera UTF-8 tillämpas för alla "
 "installerade språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4289,70 +4416,75 @@ msgstr ""
 "knappar."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Lägg till eller ändra en post i bootmenyn"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "För att göra detta måste du manuellt redigera /boot/grub2/custom.cfg, eller "
 "använda grub-customizer (den finns i Mageias paketförråd)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Mer information hittar du i vår wiki: <link ns2:href=\"https://wiki.mageia."
 "org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-"
 "efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Gränssnitt för starthanteraren"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Som standard använder Mageia endast:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (med eller utan grafisk meny) för ett Legacy/MBR eller Legacy/GPT-"
 "system."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi för ett UEFI-system."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageias grafiska menyer är fina :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 för ett Legacy/MBR eller Legacy/GPT-system."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4365,27 +4497,32 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi för ett UEFI-system."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "På ett UEFI-system är användargränssnittet lite annorlunda eftersom du inte "
 "kan välja mellan text eller grafisk meny."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4398,52 +4535,56 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Använder en startshanterare från Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Som standard baserat på ditt system så kommer Mageia att skriva en ny:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "En GRUB2 starthanterare på antingen MBR (Master Boot Record) på din första "
 "hårddisk, eller på BIOS boot-partitionen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "En Grub2-efi starthanterare på ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4456,18 +4597,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Använder en befintlig startshanterare"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Den exakta proceduren för att lägga till ditt Mageia-system i en befintlig "
 "starthanterare är utanför ramen av denna hjälp. I de felsta fall innebär det "
@@ -4475,20 +4617,20 @@ msgstr ""
 "till det automatiskt. Se dokumentationen för operativsystemet i fråga."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Använder kedjeladdning"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4501,14 +4643,14 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4517,80 +4659,79 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Alternativ"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Första sidan"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr "<guilabel>Lösenord</guilabel>: Här anger du ditt verkliga lösenord"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Lösenord (igen)</guilabel>: Upprepa lösenordet, sedan kommer Drakx "
 "att kontrollera så att det matchar med ovanstående."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Avancerat</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Aktivera SMP</guilabel>: Det här alternativet aktiverar / "
 "avaktiverar symmetrisk multiprocessering för flerkärniga processorer."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Aktivera APIC</guilabel>: Genom att aktivera/avaktivera detta så "
 "får operativsystemet tillgång till Advanced Programmable Interrupt "
@@ -4598,27 +4739,28 @@ msgstr ""
 "avancerad IRQ (Interrupt Request)-hantering"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Aktivera APIC</guilabel>: Här kan du ställa in likal APIC som "
 "hanterar externa avbrott för en specifik processor i ett SMP-system."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Nästa sida"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Standard:</guilabel> Operativsystemet som startar som standard"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4627,7 +4769,7 @@ msgstr ""
 "till information till kärnan när du startar upp. "
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4636,22 +4778,22 @@ msgstr ""
 "\"setupMageiaBootloader\">Att använd Mageias starthanterare</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Ställ in SCSI"
 
@@ -4664,35 +4806,38 @@ msgstr "Ställ in SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX brukar vanligtvis upptäcka hårddiskar på rätt sätt. Med vissa äldre "
 "SCSI-kontrollers kan den ibland inte hitta en lämplig drivrutin att använda "
 "och kan därför inte känna igen disken."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Om det inträffar måste du manuellt tala om för DrakX vilken SCSI-disk du har."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX bör sedan kunna konfigurera disken korrekt."
 
@@ -4713,10 +4858,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "På den här sidan visas namnet på drivrutinen som installationsprogrammet "
 "valt för ditt ljudkort som blir standard drivrutin, om vi har en sådan."
@@ -4737,26 +4882,30 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "När du är i draksound eller \"Ljudkonfiguration\" under verktyg, klicka på "
 "<guibutton>Avancerat</guibutton> och sedan på <guibutton>Felsökning</"
 "guibutton> för att se användbara tips och råd om hur problemet kan lösas."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Avancerat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Att klicka på <guibutton>Avancerat</guibutton> på denna skärm under "
 "installation kan vara bra om det inte finns någon standard drivrutin, och "
@@ -4764,16 +4913,17 @@ msgstr ""
 "valt en felaktig drivrutin."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "I det fallet kan du välja en annan drivrutin efter att ha klickat på "
 "<guibutton>Låt mig välja drivrutin</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Bekräfta hårddisken som ska formateras"
 
@@ -4784,13 +4934,13 @@ msgstr "Bekräfta hårddisken som ska formateras"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4800,17 +4950,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Klicka på <guibutton>Föregående</guibutton> om du inte är säker på ditt val."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Klicka på <guibutton>Nästa</guibutton> om du är säker och vill radera alla "
 "partitioner, operativsystem och data på den hårddisken "
@@ -4935,16 +5088,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Avinstallera Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Guide"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Om Mageia inte lyckats övertyga dig eller om du inte kan installera det "
@@ -4952,27 +5101,29 @@ msgstr ""
 "och Mageia ger dig även möjlighet att avinstallera. Något som inte kan sägas "
 "för alla operativsystem."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Säkerhetskopiera din data och starta datorn med Mageias DVD och välj Rescue "
 "system, välj sedan att återställa Windows boot loader. Efter nästa omstart "
 "har du bara kvar Windows utan möjlighet att välja operativsystem."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "För att få tillbaka utrymme som användes av Mageia i Windows, klicka på "
 "<code>Start -> Kontrollpanelen -> Administrationsverktyg -> Datorhantering -"
@@ -4982,8 +5133,8 @@ msgstr ""
 "partitionerna och välj <guibutton>Ta bort volym</guibutton>. Utrymmet kommer "
 "att frigöras."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -4991,14 +5142,15 @@ msgstr ""
 "Om du använder Windows XP kan du skapa en ny partition och formatera den "
 "(FAT32 eller NTFS). Den blir tilldelad en enhetsbokstav."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Om du har Vista eller 7 har du ytterligare ett val där du kan utvidga "
 "existerande partition som finns till vänster om det lediga utrymmet. Det "
@@ -5050,3 +5202,326 @@ msgid ""
 msgstr ""
 "I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du "
 "kommer att få en blank skärm i slutet vilket är normalt."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Lösenord (igen)</guilabel>: Skriv lösenordet för användaren "
+#~ "igen i det här textfältet. Drakx kontrollerar att du har angivit samma "
+#~ "lösenord i båda fälten."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "Du kan även aktivera eller inaktivera ett gästkonto."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Allt som en gäst med ett standard <emphasis>rbash</emphasis>-gästkonto "
+#~ "sparar till sin hemkatalog kommer att raderas när han loggar ut. Gästen "
+#~ "bör spara sina viktiga filer till ett USB-minne"
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Aktivera gästkonto</guilabel>: Här kan du aktivera eller "
+#~ "inaktivera ett gästkonto. Gästkontot tillåter vem som helst att logga in "
+#~ "och använda datorn, men har en mer begränsad tillgång än vanliga "
+#~ "användare."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grupp-ID</guilabel>: Här kan du ange ett grupp-ID. Det är också "
+#~ "ett nummer, vanligtvis samma som för användaren. Lämna tomt om du inte "
+#~ "vet vad du gör."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Enhet\" består av: \"hårddisk\", [\"hårddisknummer \"(bokstav)], "
+#~ "\"partitionsnummer\" (exampelvis, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "Arbetsstation."
+
+#~ msgid "Server."
+#~ msgstr "Server."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafisk miljö."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Det finns fyra grupper. Klicka på triangeln intill en grupp för att "
+#~ "expandera och se alla tjänster som den innehåller."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Om du inte kan hitta ditt kort i listan över tillverkare (för att det "
+#~ "ännu inte finns i databasen eller att det är ett äldre kort) så kan du "
+#~ "hitta en passande drivrutin i Xorg-kategorin"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Det finns en flik för varje hårddisk eller annan lagringsenhet som har "
+#~ "hittats, t. ex ett USB-minne. Det finns sda, sdb och sdc om där är tre "
+#~ "stycken."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Installationsprogrammet kommer att dela på tillgängligt utrymme enligt "
+#~ "följande regler:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"Rikta mot\" \"MiB\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Ledigt utrymme före (MiB)\" \"2\""
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Språk (endast för installation, det kan vara annorlunda än det valda "
+#~ "språket för systemet) genom att trycka på F2 (endast legacy-läge)"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Här är t. ex. den franska välkomstskärmen vid användning av en Live DVD/"
+#~ "CD. Observera att menyn på en Live DVD/CD inte föreslår: <guilabel>Rescue "
+#~ "System</guilabel>, <guilabel>Memory Test</guilabel> och "
+#~ "<guilabel>Hardware Detection Tool</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Lägg till kernel-alternativ genom att trycka på <emphasis role=\"bold"
+#~ "\">F6</emphasis> i legacy-läge, eller <emphasis role=\"bold\">e</"
+#~ "emphasis> för UEFI-läge."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Om installationen misslyckas kan det bli nödvändigt att försöka igen "
+#~ "genom att använda några extra alternativ. Tryck på F6 för att få fram en "
+#~ "meny som visar en ny rad kallad <guilabel>Boot options</guilabel> och "
+#~ "föreslå fyra poster:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Lägg till fler kernel-alternativ genom att trycka på F1 (endast legacy-"
+#~ "läge)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Använder ett trådburet nätverk"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Det tillåter inte ändringar i språket, tillgängliga alternativ finns "
+#~ "beskrivna på skärmen. För mer information hur man använder en trådburen "
+#~ "nätverksbaserad installations-CD, se <link ns2:href=\"https://wiki.mageia."
+#~ "org/en/Boot.iso_install\">Mageias Wiki</link>"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Tangentbordslayouten är amerikansk."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Om \"Med X\" är valt så kommer även IceVM inkluderas som en lätt "
+#~ "skrivbordsmiljö."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Här kan du justera din säkerhetsnivå."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Om du inte vet vad du ska välja så lämna standardinställningarna som de "
+#~ "är."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "LIVE media: Du kan starta mediet i ett äkta Mageia-system utan att "
+#~ "installera det för att se hur det ser ut efter installation. "
+#~ "Installationen är sedan lättare men du har färre val."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Endast bootbar CD-media"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Markera knappen Spara fil."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Du kan även använda verktyget dd i en konsol:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Koppla från ditt USB-minne och sedan är allt klart."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Välj det här alternativet för en ren <application>Mageia</application>-"
+#~ "installation."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Om du har en eller flera <application>Mageia</application>-installationer "
+#~ "i ditt system kan du med installationsprogrammet uppgradera en av dem "
+#~ "till den senaste utgåvan."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Guide"
diff --git a/docs/docs/stable/installer/tg.po b/docs/docs/stable/installer/tg.po
index 814b9743..8593b426 100644
--- a/docs/docs/stable/installer/tg.po
+++ b/docs/docs/stable/installer/tg.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
-# 
+#
 # Translators:
 # Victor Ibragimov <victor.ibragimov@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-08-21 06:59+0000\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
-"Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/tg/)\n"
+"Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
+"tg/)\n"
+"Language: tg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Content of: <section><info><title>
@@ -26,11 +27,11 @@ msgstr "Иҷозатнома ва тавзеҳи барориш"
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" "
-"fileref=\"dx2-license.png\"/> </imageobject> <imageobject> <imagedata xml:id"
-"=\"acceptLicense-im2\" revision=\"5\" align=\"center\" condition=\"live\" "
-"format=\"PNG\" fileref=\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -41,30 +42,29 @@ msgstr ""
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:43
 msgid ""
-"Before installing <application>Mageia</application>, please read the license"
-" terms and conditions carefully."
+"Before installing <application>Mageia</application>, please read the license "
+"terms and conditions carefully."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:46
 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 <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:53
 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 looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
@@ -75,73 +75,72 @@ msgstr "Тавзеҳи барориш"
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
 msgid ""
-"Important information are given about this release of "
-"<application>Mageia</application> and are accessible clicking on the "
-"<guibutton>Release Notes</guibutton> button."
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
+"guibutton> button."
 msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "en"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 
-#.  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
+#.  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 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The"
-" source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -151,199 +150,174 @@ msgstr ""
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
-"fileref=\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id"
-"=\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata "
-"format=\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
+"<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>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the"
-" top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
 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:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user"
-" password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - "
-"Summary</emphasis> step during the install. Choose <emphasis>User "
-"management</emphasis>."
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
+"The <guibutton>Advanced</guibutton> 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:86
+#: en/addUser.xml:101
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:107
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
-msgstr ""
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
-msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know"
-" what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Нуқтаи насбкуниро интихоб намоед"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
-#.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least
-#. ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
-#.  Marja: you're right, in English English it is "its type", however, the
-#. Americans
-#.        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
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
+#.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
+#.  Marja: you're right, in English English it is "its type", however, the Americans
+#.        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 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" "
-"fileref=\"dx2-chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id"
-"=\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id=\"live-"
-"chooseMountPoints-im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -351,58 +325,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount "
-"point\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
 msgid ""
-"If you have many partitions, you can choose many different mount points from"
-" the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the "
-"<literal>/home</literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
-"If you are sure the mount points are correct, click on "
-"<guibutton>Next</guibutton>, and choose whether you only want to format the "
-"partition(s) DrakX suggests, or more."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -448,8 +425,8 @@ msgstr ""
 #: 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 "
+"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."
@@ -500,10 +477,10 @@ 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."
+"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 ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -527,7 +504,8 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:19
-msgid "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+msgid ""
+"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -537,8 +515,7 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:21
-msgid ""
-"F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -602,8 +579,8 @@ msgstr ""
 #: en/bootLive.xml:32
 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>."
+"and keyboard, then the processes differ, with <link linkend=\"testing"
+"\">additional steps in Live mode</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -614,14 +591,14 @@ 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."
+"Depending on your selection here, you may be offered further screens to fine-"
+"tune your choice."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -636,13 +613,14 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -654,14 +632,14 @@ msgstr "Интихоби Гурӯҳи Қуттиҳо"
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:9
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" "
-"fileref=\"dx2-choosePackageGroups.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -669,107 +647,102 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
+msgid "<emphasis role=\"bold\">Server</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr ""
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
 msgid ""
-"Here you can add or remove any extra packages to customise your "
-"installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy "
-"icon</guibutton> at the bottom of the page to save your choice of packages "
-"(saving 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 <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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr ""
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" xml:id"
-"=\"configureServices-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
 msgid ""
-"Here you can set which services should (not) start when you boot your "
-"system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and"
-" see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+msgid "The settings DrakX chose are usually good."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 
@@ -778,30 +751,30 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Минтақаи вақти худро танзим кунед"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id"
-"=\"configureTimezoneUTC-im1\" revision=\"1\" "
-"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> "
-"</imageobject> <imageobject> <imagedata fileref=\"live-timeZone.png\" "
-"condition=\"live\" format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the"
-" same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to"
-" GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 
 #. type: Content of: <section><note><para>
@@ -812,209 +785,201 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id"
-"=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_card_list-im1\" "
+"align=\"center\" fileref=\"dx2-configureX_card_list.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
-msgstr ""
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or"
-" any other graphical environment to work well, the following "
+"<acronym>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 you can see that <application>DrakX</application> didn't make a "
-"choice, or if you think the choice is incorrect."
+"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:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept."
-" If you don't see anything, you'll return to the configuration screen and be"
-" able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't "
-"available</emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id"
-"=\"configureX_monitor-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the"
-" screen is refreshed and horizontal sync is the rate at which scan lines are"
-" displayed."
+"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:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1023,223 +988,224 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is"
-" often a good monitor selection group if you need to use the Vesa card "
-"driver when your video hardware cannot be determined automatically. Once "
-"again it may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-diskdrake.png\" align=\"center\"/> </imageobject> <imageobject"
-" condition=\"live\"> <imagedata fileref=\"live-diskdrake.png\" "
-"align=\"center\"/> </imageobject>"
+"<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:18
+#: en/diskdrake.xml:22
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The"
-" encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even"
-" view what is in them before you start."
+"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:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an"
-" USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected"
-" storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert "
-"mode</guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 msgid ""
-"<imageobject condition=\"classical\"><imagedata "
-"fileref=\"dx2-diskdrake2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata align=\"center\" fileref=\"live-"
-"diskdrake2.png\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata align=\"center\" fileref=\"live-"
-"doPartitionDisks3.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Ҷузъбандӣ"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-doPartitionDisks.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-"
-"doPartitionDisks.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
-"If you have unused space on your hard drive then this option will use it for"
-" your new Mageia installation."
+"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:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may"
-" offer to use it."
+"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:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1247,7 +1213,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1258,40 +1224,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: 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>"
+"<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:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+msgid "This option will allocate the entire drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1299,130 +1266,134 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Ҷузъбандии дастии диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
-"This gives you complete control over the placing of the installation on your"
-" hard drive(s)."
+"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:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
 msgid ""
-"If the total available place is over 50 GB, then three partitions are "
-"created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:130
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#. 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"
 msgstr ""
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:138
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on "
-"/boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref "
-"linkend=\"diskdrake\"/> to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning"
-" tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
+#: en/doPartitionDisks.xml:189
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
+#: en/doPartitionDisks.xml:191
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 
 #. type: Content of: <article><info><title>
@@ -1431,7 +1402,7 @@ msgid "Installation from LIVE medium"
 msgstr ""
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
@@ -1446,78 +1417,84 @@ msgid "Mageia 5"
 msgstr ""
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr ""
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
+"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
-"This manual was produced with the help of the <link "
-"ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
-"ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>."
+"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."
+"neodoc.biz\">NeoDoc</link>."
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
+"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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 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:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
-"No one will see all the installer screens that you see in this manual. Which"
-" screens you will see, depends on your hardware and the choices you make "
+"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:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 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"
@@ -1525,41 +1502,41 @@ msgstr "Табрик"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
-"You have finished installing and configuring "
-"<application>Mageia</application> and it is now safe to remove the "
-"installation medium and reboot your computer."
+"You have finished installing and configuring <application>Mageia</"
+"application> and it is now safe to remove the installation medium and reboot "
+"your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating"
-" systems on your computer (if you have more than one)."
+"After reboot, in the bootloader screen, you can choose between the operating "
+"systems (if there are more than one) on your computer."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1573,31 +1550,31 @@ msgstr "Девори оташ"
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be"
-" accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no "
-"firewall)</emphasis>\" button has a particular role: it enables access to "
-"all services of the machine - an option that does not make much sense in the"
-" context of the installer since it would create a totally unprotected "
-"system.  Its veritable use is in the context of the Mageia Control Center "
-"(which uses the same GUI layout) for temporarily disabling the entire set of"
-" firewall rules for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you"
-" will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1608,110 +1585,106 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
-"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to"
-" the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
 "in <emphasis>RFC-433</emphasis>;"
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
-"<emphasis>UDP</emphasis> - the internet protocol that is used by the "
-"service."
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr ""
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" "
-"fileref=\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id"
-"=\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
-"formatPartitions-im1\"> </imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
-"When you are confident about the selection, click on "
-"<guibutton>Next</guibutton> to continue."
+"When you are confident about the selection, click on <guibutton>Next</"
+"guibutton> to continue."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1719,301 +1692,252 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
-msgid "<imageobject> <imagedata fileref=\"dx-welcome-lang.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 ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue "
-"System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
-"Detection Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
 msgid ""
-"Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
-msgid "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:77
 msgid ""
-"Add some kernel options by pressing the <emphasis "
-"role=\"bold\">F6</emphasis> key for the legacy mode or the <emphasis "
-"role=\"bold\">e</emphasis> key for the UEFI mode."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:81
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/installer.xml:96
-msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+msgid "Default: It doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
 msgid ""
-"When you select one of these entries, it modifies the default options "
-"displayed in the <guilabel>Boot Options</guilabel> line."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
-msgid "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"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 ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#. 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><para><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
 #: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with"
-" the arrow keys and press Enter to have more details or press the Esc key to"
-" go back to the welcome screen."
+"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 ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
-msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:132
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
-msgid "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:139
 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>"
+"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 ""
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
+#. 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><para>
-#: en/installer.xml:161
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:151
 msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+"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 ""
 
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:158
 msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link "
-"ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">the Mageia "
-"Wiki</link>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
+#. 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><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#. 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:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
 msgid ""
-"The install process is divided into a number of steps, which can be followed"
-" on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
 msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
-"options."
+"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><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
-"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 "
+"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."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2021,22 +1945,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit"
-" ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2046,33 +1972,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. "
-"e.g. <code>mem=256M</code> would specify 256MB of RAM."
+"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
+"g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-"
-"us/library/cc776315.aspx\">http://msdn.microsoft.com/en-"
-"us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2080,41 +2006,36 @@ msgstr ""
 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
+#.  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:13
+#: en/installUpdates.xml:15
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2150,9 +2071,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 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 another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2160,117 +2080,114 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 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)
+#.  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)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" xml:id"
-"=\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories"
-" selection determines which packages will be available for selection during "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
 "the next steps."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
-"of-charge, i.e. Mageia may redistribute them, but they contain closed-source"
-" software (hence the name - Nonfree). For example this repository includes "
+"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 "
 "cards, etc."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
 msgid ""
-"The <emphasis>Tainted</emphasis> repository includes packages released under"
-" a free license. The main criteria for placing packages in this repository "
-"is that they may infringe patents and copyright laws in some countries, e.g."
-" Multimedia codecs needed to play various audio/video files; packages needed"
-" to play commercial video DVD, etc."
+"The <emphasis>Tainted</emphasis> repository includes packages released under "
+"a free license. The main criteria for placing packages in this repository is "
+"that they may infringe patents and copyright laws in some countries, e.g. "
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: 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\"></xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
-"contains the man pages from the <link "
-"xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation "
-"Project</link> and the <link "
-"xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU "
-"coreutils</link> info pages."
+"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:41
+#: en/minimal-install.xml:35
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2281,23 +2198,24 @@ msgstr ""
 #.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:10
-msgid "<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2312,201 +2230,199 @@ msgstr ""
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Минтақаи вақт</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref "
-"linkend=\"configureTimezoneUTC\"/>"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+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:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
-"You can add extra users here. They will each get their own "
-"<literal>/home</literal> directories."
+"You can add extra users here. They will each get their own <literal>/home</"
+"literal> directories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: 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 none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
-msgid ""
-"This section allows you to configure your graphic card(s) and displays."
+#: en/misc-params.xml:140
+msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" "
-"align=\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> "
-"</imageobject>"
+"<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:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2514,48 +2430,48 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
 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 get the parameters you "
+"need to enter here."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Амният"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
-"Here you set the Security level for your computer, in most cases the default"
-" setting (Standard) is adequate for general use."
+"Here you set the Security level for your computer, in most cases the default "
+"setting (Standard) is adequate for general use."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2563,7 +2479,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
@@ -2589,16 +2505,16 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/reboot.xml:15
 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 "
+"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)."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:17
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref"
-"=\"live-reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2611,43 +2527,73 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/resizeFATChoose.xml:20
 msgid ""
-"You have more than one "
-"<application>Windows<superscript>®</superscript></application> partition.  "
-"Choose which one should be made smaller to make space for installing "
-"<application>Mageia</application>."
+"You have more than one <application>Windows<superscript>®</superscript></"
+"application> partition.  Choose which one should be made smaller to make "
+"space for installing <application>Mageia</application>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Сатҳи Амният"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
-"</imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2664,248 +2610,226 @@ msgstr "Муқаддима"
 #: en/SelectAndUseISOs2.xml:10
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+msgid "There are two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
 msgid ""
-"You can find them <link "
-"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:44
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:47
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#. 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 ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "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:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:74
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
-msgid ""
-"Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
+#. 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 ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#. 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 from previous "
+"installations, they cannot be used to upgrade previously installed Mageia "
 "releases.</emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#. 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."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#. 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:120
+#. 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:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
+#: en/SelectAndUseISOs2.xml:139
+msgid "Net install media"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:144
 msgid ""
-"Each one is a small image that contains 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."
+"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:153
+#. 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 when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:161
+msgid "First steps are English language only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
-"Contains only free software, for those people who prefer not to use non-free"
-" software."
+"Contains only free software, for those people who prefer not to use non-free "
+"software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
@@ -2913,8 +2837,7 @@ msgstr ""
 msgid "netinstall-nonfree.iso"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:178
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
@@ -2934,10 +2857,10 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
 msgid ""
-"Once you have chosen your ISO file, you can download it using either http or"
-" BitTorrent. In both cases, a window gives you some information, such as the"
-" mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"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."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -2948,9 +2871,9 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>."
-" Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
@@ -2960,7 +2883,7 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
+msgid "Select the Save File option, then, click OK."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
@@ -2969,206 +2892,209 @@ msgid "Checking the integrity of the downloaded media"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+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><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum "
-"path/to/the/image/file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum "
-"path/to/the/image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a"
-" while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link "
-"ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the Mageia"
-" wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
-"You can use a graphical tool like <link "
-"ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
+"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:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr ""
-
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:310
 msgid ""
-"Alternatively, you can get the device name with the command "
-"<code>dmesg</code>: at end, you see the device name starting with "
-"<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3191,46 +3117,47 @@ msgid ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example "
-"<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:317
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:337
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:340
+msgid "Where X=your device name eg: /dev/sdd"
+msgstr ""
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:341
+msgid ""
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso "
-"of=/dev/sdb bs=1M</userinput>"
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3242,125 +3169,127 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:9
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" "
-"align=\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> "
-"</imageobject>"
+"<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
 msgid ""
-"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."
+"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."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other "
-"Countries</guilabel> button and choose your country / region there."
+"If your country isn't in the list, click the <guilabel>Other Countries</"
+"guilabel> option and choose your country / region there."
 msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
-"input method (at the bottom of the list). Input methods allow users to input"
-" multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
+"input method (at the bottom of the list). Input methods allow users to input "
+"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Коргузорӣ"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do"
-" a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: 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 "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you"
-" want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl "
+"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 ""
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
 msgid ""
-"If you have discovered that you forgot to select an additional language, you"
-" can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do "
-"<emphasis>not</emphasis> do this later in the install."
+"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."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3372,81 +3301,80 @@ msgstr ""
 #: en/selectKeyboardLive.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
 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 "
+"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 ""
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Забонак"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\""
-" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
-"If you don't know which layout your keyboard has, look in the specifications"
-" that came with your system, or ask the computer vendor. There may even be a"
-" label on the keyboard that identifies the layout. You can also look here: "
-"<link "
-"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
+"If you don't know which layout your keyboard has, look in the specifications "
+"that came with your system, or ask the computer vendor. There may even be a "
+"label on the keyboard that identifies the layout. You can also look here: "
+"<link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en."
+"wikipedia.org/wiki/Keyboard_layout</link>"
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
 msgid ""
-"If your keyboard isn't in the list shown, click on "
-"<guibutton>More</guibutton> to get a full list, and select your keyboard "
-"there."
+"If your keyboard isn't in the list shown, click on <guibutton>More</"
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though"
-" a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"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."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Илтимос, барои истифода забонро интихоб кунед"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3454,60 +3382,60 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be"
-" difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" "
-"fileref=\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-language.png\" "
-"format=\"\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
 msgid ""
-"Even if you choose more than one language, you must first choose one of them"
-" as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3518,11 +3446,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  Made by marja on 2012 04 11
-#.  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
+#.  Made by marja on 2012 04 11 
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3540,8 +3467,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:25
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
-"mice</guilabel> is a good choice."
+"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
+"guilabel> is a good choice."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3552,369 +3479,354 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
 msgid ""
-"For more information, see our wiki: <link "
-"ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Хосиятҳои асосии корандози худборшав"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+msgid "GRUB2-efi for a UEFI system."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" "
-"fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<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 ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+msgid "GRUB2-efi on UEFI systems"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader2.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-"
-"setupBootloader2.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi)."
-" If there are already UEFI operating systems installed on your computer "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
+"If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard"
-" drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: 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 uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" "
-"align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-setupBootloader3.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and"
-" add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: 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 Check the box <guilabel>Do not touch ESP"
-" or MBR</guilabel>."
+"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 ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader4.png\" align=\"center\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-"
-"setupBootloader4.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
-"You will get a warning that the bootloader is missing, ignore it by clicking"
-" <guibutton>OK</guibutton>."
+"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:142
+#: en/setupBootloader.xml:111
 msgid ""
-"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Хосиятҳо"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#. 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 asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#. 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><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#. 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 set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:127
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#. 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 "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:135
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:138
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
-"<guilabel>Probe foreign OS</guilabel>: see above <link "
-"linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:159
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 
-#. type: Content of:
-#. <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr ""
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's
-#. comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  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
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  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 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers"
-" it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
@@ -3927,16 +3839,15 @@ msgstr "Танзимкунии садо"
 #. 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>"
+"<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 we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -3952,66 +3863,66 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on "
-"<guibutton>Troubleshooting</guibutton> to find very useful advice about how "
-"to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Имконоти иловагӣ"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
-#.     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
+#.     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 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> "
-"</imageobject> <imageobject condition='classical'> <imagedata "
-"fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" "
-"></imagedata> </imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every"
-" partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4088,8 +3999,7 @@ msgstr ""
 
 #. type: Content of: <section><section><section><remark>
 #: en/testing.xml:66
-msgid ""
-"The configuration settings you made here are kept for the installation."
+msgid "The configuration settings you made here are kept for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
@@ -4100,8 +4010,8 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
@@ -4109,9 +4019,8 @@ msgstr ""
 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."
+"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
+"link> step\" as for the direct installation."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4119,54 +4028,49 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr ""
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will"
-" only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management "
-"-> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and"
-" make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4177,29 +4081,29 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
 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. 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."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"../live-unused-"
-"InstallationProgress.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 
 #. 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."
+"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 ""
diff --git a/docs/docs/stable/installer/tr.po b/docs/docs/stable/installer/tr.po
index 679d3a65..d4fc4027 100644
--- a/docs/docs/stable/installer/tr.po
+++ b/docs/docs/stable/installer/tr.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: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-01-11 21:43+0000\n"
 "Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -34,12 +34,13 @@ msgstr "Lisans ve Sürüm Notları"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -72,8 +73,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Kabul etmek için basitçe <guilabel>Onayla</guilabel> kutucuğunu seçin ve "
@@ -96,9 +98,10 @@ msgstr "Sürüm Notları"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "<application>Mageia</application>nın bu yayımı ile ilgili önemli bilgiler "
@@ -106,13 +109,13 @@ msgstr ""
 "bilgilere erişebilirsiniz."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "tr"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Veri Kaynağı Seçimi (Ek Kurulum Kaynağı Yapılandırın)"
 
@@ -120,46 +123,50 @@ msgstr "Veri Kaynağı Seçimi (Ek Kurulum Kaynağı Yapılandırın)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "Bu ekran önceden tanımlanmış depoların listesini verir. Paketler için, optik "
 "disk veya uzak kaynak gibi başka kaynaklar ekleyebilirsiniz. Kaynak seçimi, "
 "ilerki adımlarda hangi paketlerin erişilebilir olacağını belirleyecektir."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Ağ kaynakları için takip edilecek iki adım vardır:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Henüz yapmadıysanız, ağ seçimi ve etkinleştirilmesi."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Bir yansı veya bir URL bağlantısı seçmek (ilk girdi). Bir yansı seçerek "
 "Mageia tarafından yönetilen tüm depolara, mesela Nonfree, Tainted depoları "
@@ -167,14 +174,15 @@ msgstr ""
 "bir depoyu veya kendi NFS kurulumunuzu belirtirsiniz."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "32 bit paketleri de içeren bir 64 bit kurulumunu güncellemek istiyorsanız, "
 "buradaki ağ protokollerinden birine tıklayarak çevrimiçi bir yansıyı eklemek "
@@ -190,7 +198,7 @@ msgstr "Kullanıcı ve Süper Kullanıcı Yönetimi"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -203,21 +211,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Yönetici (kök) Parolasını Ayarlayın:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "Tüm <application>Mageia</application> kurulumları için Linux' ta "
 "<emphasis>kök parolası</emphasis> olarak bilinen bir süper kullanıcı veya "
@@ -229,9 +237,10 @@ msgstr ""
 "yazılmadığı denetlenir."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Tüm parolalar büyük-küçük harfe duyarlıdır. Harflerin (büyük harf ve küçük "
@@ -239,16 +248,18 @@ msgstr ""
 "en iyisidir."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Bir kullanıcı girin"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "Buraya bir kullanıcı ekleyin. Bir kullanıcı, süper kullanıcıdan (kök) daha "
 "az yetkiye sahiptir; ancak internette gezinmeye, ofis uygulamalarını "
@@ -256,7 +267,7 @@ msgstr ""
 "bilgisayarında yaptığı diğer her şeyi  yapmaya yetkisi olur"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -265,7 +276,7 @@ msgstr ""
 "değiştirebilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -274,10 +285,11 @@ msgstr ""
 "girin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Giriş Adı</guilabel>: Burada kullanıcının giriş adını "
@@ -286,40 +298,42 @@ msgstr ""
 "duyarlıdır.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Şifre</guilabel>: Bu metin kutusuna kullanıcı parolası yazın. "
 "Metin kutusunun sonunda şifre gücünü gösteren bir kalkan vardır. (Ayrıca "
 "bkz: <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>Parola (yeniden)</guilabel>: Kullanıcı parolasını bu metin "
-"kutusuna yeniden yazın ki drakx her bir kullanıcı parolası metin kutusunda "
-"aynı parolanın bulunduğunu denetleyebilsin."
+"<guilabel>Parola (tekrar)</guilabel>: Parolanızı yeniden yazın. Böylece "
+"Drakx üstte yazılan parola ile uyuşup uyuşmadığını denetler."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Mageia' yı kurarken eklediğiniz her kullanıcı için herkes tarafından "
 "okunamayan ve yazılamayan bir ev dizini oluşturulur (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -328,89 +342,59 @@ msgstr ""
 "emphasis>ni seçin."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "Erişim izinleri kurulumdan sonra da değiştirilebilir."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Gelişmiş Kullanıcı Yönetimi"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "<guibutton>gelişmiş</guibutton> düğmesine tıklanmışsa eklemekte olduğunuz "
 "kullanıcı için ayarları değiştirebilmenizi sağlayan bir ekran önerilir."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-"Ek olarak, bir konuk hesabını etkinleştirebilir veya devre dışı "
-"bırakabilirsiniz."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Öntanımlı bir <emphasis>rbash</emphasis> konuk hesabına sahip bir konuğun "
-"kendi /home dizinine kaydettiği her şey oturumunu kapattığında silinir.   "
-"Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Konuk hesabını etkinleştir</guilabel>: Burada bir konuk hesabını "
-"etkinleştirebilir veya devre dışı bırakabilirsiniz. Konuk hesabı, bir "
-"konuğunuzun bilgisayarda oturum açmasını ve kullanmasını sağlar; ancak "
-"normal kullanıcılardan çok daha sınırlı erişim verir."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
-msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Kabuk</guilabel>: Bu açılır liste, bir önceki ekranda eklediğiniz "
 "kullanıcının kabuğunu değiştirmenizi sağlar. Seçenekler Bash, Dash ve Sh' "
 "dir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Kullanıcı Kimliği</guilabel>: Burada, bir önceki ekranda "
 "eklediğiniz kullanıcının kullanıcı kimliğini ayarlayabilirsiniz. Bu bir "
 "rakamdır.   Ne yaptığınızı bilmiyorsanız boş bırakın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Grup Kimliği</guilabel>:  Bu, grup kimliğini ayarlamanızı sağlar. "
-"Genellikle kullanıcınınki ile aynı olan bir rakamdır. Ne yaptığınızı "
-"biliyorsanız boş bırakın."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Bağlama noktasını seçin"
 
@@ -427,13 +411,14 @@ msgstr "Bağlama noktasını seçin"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -443,7 +428,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -454,41 +439,45 @@ msgstr ""
 "bağlama noktalarını değiştirebilirsiniz."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "Bir şeyi değiştirirseniz, <literal>/</literal> (kök) disk bölümünüzün "
 "olduğundan emin olun."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Her disk bölümü şöyle görüntülenir: \"Aygıt\" (\"Boyut\", \"Bağlama noktası"
 "\", \"Türü\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"\"Aygıt\", şunları ifade eder: \"sabit disk\", [\"sabit disk numarası"
-"\" (harf)] , \"disk bölümü numarası\" (mesela, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Bir çok disk bölümünüz varsa, açılır menüden bir çok farklı bağlama "
 "noktasını seçebilirsiniz, mesela <literal>/</literal>, <literal>/home</"
@@ -498,20 +487,22 @@ msgstr ""
 "literal> disk bölümü için <literal>/cauldron-home</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Erişim sağlamaya gereksinim duymadığınız disk bölümleri için bağlama noktası "
 "alanını boş bırakabilirsiniz."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Neyi seçeceğinizden emin değilseniz <guibutton>Geri</guibutton> düğmesini "
 "seçebilir ve sonra <guilabel>Özel Disk Bölümlendirme</guilabel> seçeneğini "
@@ -519,7 +510,7 @@ msgstr ""
 "boyutunu görebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -787,8 +778,9 @@ msgstr "Masaüstü Seçimi"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Buradaki seçiminize dayalı olarak seçtiğinizi ayarlamak için başka ekranlar "
@@ -796,8 +788,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -815,14 +808,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Masaüstü ortamlarından <application>KDE</application> mi yoksa "
 "<application>Gnome</application> masaüstü mü kullanmak istediğinizi seçin. "
@@ -850,8 +845,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -863,62 +859,69 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "İş İstasyonu."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Disk bölümü boyutlandırma:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Sunucu."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Grafiksel Ortam."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Tek tek paket seçimi: El ile ekleme veya paket kaldırmak için bu seçeneği "
 "kullanabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "En ufak kurulumu (X olmadan veya X ile &amp; IceWM) nasıl yapacağınıza dair "
 "yönergeler için <xref linkend=\"minimal-install\"/> yardımını okuyun."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Paketleri Tek Tek Seçin"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "Kurulumunuzu kişiselleştirmek için burada, tüm ek paketleri kurabilir veya "
 "kaldırabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -932,47 +935,45 @@ msgstr ""
 "yüklemeyi seçerek, aynı paketleri bir başka bilgisayarda da kurabilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Hizmetleri Yapılandırma"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "Burada sisteminizi başlattığınızda hangi hizmetlerin başlatıl(may)acağını "
 "ayarlayabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Dört grup vardır. Bir grubun önündeki ok işaretine tıklayarak grup içindeki "
-"hizmetleri görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "DrakX tarafından seçilen ayarlar genellikle en iyi ayarlardır."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -981,7 +982,7 @@ msgstr ""
 "görüntülenir."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr ""
 "Ne yaptığınızı çok ama çok iyi bir şekilde biliyorsanız burada bir şeyleri "
@@ -996,12 +997,13 @@ msgstr "Zaman Dilimini Yapılandırma"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1011,18 +1013,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Zaman diliminizi ülkenizi veya aynı zaman  diliminde olup da size yakın "
 "bulunan bir şehri seçerek belirleyin."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "Sonraki ekranda donanım saatinizi yerel zamana veya UTC olarak da bilinen "
 "GMT zamanına göre ayarlayın."
@@ -1037,23 +1041,23 @@ msgstr ""
 "zamana veya tümünün UTC/GMT zamanına ayarlı olduğundan emin olun."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Bir X Sunucusu Seçme (Ekran Kartını Yapılandırma)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1062,7 +1066,7 @@ msgstr ""
 "ekran kartınızı doğru olarak tanımlar."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1071,100 +1075,97 @@ msgstr ""
 "hangisi olduğunu biliyorsanız, kartınızı ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "üretici"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "sonra kartınızın ismi"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "ve kartınızın türü"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Üretici listelerinde kartınızı (henüz veritabanına girmediği veya çok eski "
-"bir kart olduğu için) bulamıyorsanız uygun bir sürücüyü Xorg kategorisinde "
-"bulmanız mümkündür"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg listeleme, 40'tan fazla genel ve açık kaynak ekran kartı sürücüleri "
 "sağlar. Kartınız için adlandırılmış bir sürücü hala bulamıyorsanız, temel "
 "yetenekleri sağlayan vesa sürücü kullanma seçeneğiniz mevcuttur."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Uyumsuz sürücü seçerseniz yalnızca komut satırı arabirimine "
 "erişebileceğinizi unutmayın."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Bazı ekran kartı üreticileri, sadece Nonfree depolarında bulunabilen ve bazı "
 "durumlarda da sadece üreticinin web sitesinden edinilebilen müseccel "
 "sürücüler sunabilir."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Nonfree deposu ayrı olarak elle etkinleştirilmelidir. Önceden bu depoyu "
 "seçmediyseniz ilk yeniden başlatamadan sonra seçmelisiniz."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Ekran Kartı ve Monitör Yapılandırma"
 
 #.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "<application>Mageia</application> kurulumu sırasında hangi grafiksel ortamı "
 "(ayrıca masaüstü ortamı olarak bilinirler) seçtiğiniz fark etmeksizin, "
@@ -1177,7 +1178,7 @@ msgstr ""
 "yanlış olduğunu düşünüyorsanız doğru ayarları seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1186,13 +1187,14 @@ msgstr ""
 "listeden kartınızı seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Monitör</guibutton></emphasis>: Mümkünse <guilabel>Tak "
 "ve Kullan</guilabel> seçebilir veya  <guilabel>Üretici</guilabel> ya da "
@@ -1201,30 +1203,31 @@ msgstr ""
 "<guilabel>Kişisel</guilabel> seçeneğini seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "Yanlış tazeleme oranları monitörünüze zarar verebilir"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Çözünürlük</guibutton></emphasis>: Arzu ettiğiniz "
 "çözünürlüğü ve renk derinliğini buradan seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Dene</guibutton></emphasis>: Deneme düğmesi kurulum "
 "esnasında her zaman görüntülenmez. Düğme görüntüleniyorsa, ayarlarınızı bu "
@@ -1236,7 +1239,7 @@ msgstr ""
 "ayarlarınızın güvenli tarafta olduğundan emin olun</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1245,12 +1248,12 @@ msgstr ""
 "seçeneği etkinleştirebilir veya devre dışı bırakabilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Monitör Seçimi"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1259,12 +1262,13 @@ msgstr ""
 "monitörünüzü doğru olarak tanımlar."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Farklı niteliklere sahip bir monitörü seçmek monitörünüze veya "
 "ekran kartınıza zarar verebilir. Ne yaptığınızı bilmiyorsanız bir şeyler "
@@ -1272,23 +1276,23 @@ msgstr ""
 "gelen kılavuza bakın"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Kişisel</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1301,7 +1305,7 @@ msgstr ""
 "hangi oranda görüntüleneceğini belirler."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1314,12 +1318,12 @@ msgstr ""
 "monitörünüzün kılavuzuna bakın."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Tak ve Kullan</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1328,12 +1332,12 @@ msgstr ""
 "çalışır."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Üretici</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1342,28 +1346,30 @@ msgstr ""
 "hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "monitör üreticisinin adı"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "monitör açıklaması"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Genel</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "bu grubu seçmek, 1024x768@60Hz gibi yaklaşık 30 görüntü yapılandırması "
 "görüntüler ve dizüstü bilgisayarlarda kullanılanlar gibi Flat panel "
@@ -1373,12 +1379,12 @@ msgstr ""
 "akıllıca olur."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "DiskDrake ile kişisel disk bölümlendirme"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1389,12 +1395,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "<literal>/</literal> disk bölümünüzde şifreleme kullanmak isterseniz ayrı "
 "bir <literal>/boot</literal> disk bölümünüzün mevcut olduğundan emin "
@@ -1402,11 +1410,12 @@ msgstr ""
 "işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "Disk yerleşim düzenini burada ayarlayın. Disk bölümleri oluşturabilir veya "
 "kaldırabilir, bir disk bölümünün dosya sistemini veya boyutunu "
@@ -1414,31 +1423,32 @@ msgstr ""
 "görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Algılanan her sabit disk veya USB bellek gibi diğer depolama aygıtı için bir "
-"sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Seçili depolama aygıtındaki tüm bölümleri silmek için <guibutton>Tümünü "
 "Temizle</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Diğer eylemler için: öncelikle arzu ettiğiniz disk bölümüne tıklayın. Sonra "
 "onu görüntüleyin veya bir dosya sistemi ve bağlama noktası seçin, yeniden "
@@ -1447,32 +1457,34 @@ msgstr ""
 "türü seçmek gibi ek araçlar verir."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "İsteğiniz doğrultusunda her şeyi ayarlayana kadar devan edin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Hazır olunca <guibutton>Bitti</guibutton>' yi tıklayın."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Mageia' yı bir UEFI sisteme kuruyorsanız bir EFI Sistem Disk Bölümünün (ESP) "
 "mevcut olduğundan ve düzgün biçimde /boot/EFI üzerine bağlandığından emin "
 "olun (aşağıya bakın)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1480,12 +1492,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1494,7 +1506,7 @@ msgstr ""
 "bölümünün mevcut olduğunu denetleyin"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1507,32 +1519,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Bölümlendirme"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "Bu ekranda sabit disklerinizin içeriğini görebilir ve DrakX bölümlendirme "
 "sihirbazının <application>Mageia</application>'nın nereye kurulacağına dair "
 "bulduğu çözümlere ulaşabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Aşağıdaki listeden kullanılabilen seçenekler, belirli sabit disklerinizin "
 "bölümlendirme düzeni ve içeriğine bağlı olarak değişecektir."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1545,12 +1559,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Mevcut Disk Bölümü Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1559,12 +1573,12 @@ msgstr ""
 "bölümleri bulunmuştur ve yükleme için kullanılabilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Boş Alan Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1573,12 +1587,12 @@ msgstr ""
 "bu seçenek o alanı kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Windows Bölümündeki Boş Alan Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1587,7 +1601,7 @@ msgstr ""
 "kullanmayı önerebilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1597,7 +1611,7 @@ msgstr ""
 "riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1613,12 +1627,14 @@ msgstr ""
 "Kişisel dosyalarınızı yedeklemeniz önerilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Bu seçenekle kurulum aracı, altlarında tahmini boyutları ile Windows disk "
 "bölümlerini açık mavi renkte ve gelecekteki Mageia disk bölümünü koyu mavi "
@@ -1627,37 +1643,39 @@ msgstr ""
 "görüntüsüne bakın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Tüm Diski Sil ve Kullan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "Bu seçenek tüm sabit diski Mageia için kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Önemli! Bu işlem seçilen sabit diskteki BÜTÜN veriyi silecektir. Dikkatli "
 "olun!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1668,12 +1686,12 @@ msgstr ""
 "seçeneği kullanmayın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Özel Disk Bölümlendirme"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1681,68 +1699,83 @@ msgstr ""
 "Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Disk bölümü boyutlandırma:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "Aşağıdaki kurallara göre kurulum aracı erişilebilir alanı paylaşır:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Erişilebilir boş alan 50 GB altındaysa, / için bir tek disk bölümü "
 "oluşturulur ve /home için ayrı bir disk bölümü oluşturulmaz."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr ""
 "Erişilebilir toplam boş alan 50 GB üzerindeyse, üç disk bölümü oluşturulur"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "Toplam boş alanın 6/19 kadarı en fazla 50 GB olacak şekilde / olarak "
 "ayarlanır"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 kadarı en fazla 4 GB olacak şekilde takas olarak ayarlanır"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "kalanı (en az 12/19) ise /home olarak ayarlanır"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Böylece 160 GB ve üstü erişilebilir boş alandan, kurulum aracı üç disk "
 "bölümünü şu şekilde oluşturacaktır: / için 50 GB, takas alanı için 4 GB ve /"
 "home için arta kalan alan."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Bir UEFI sistem kullanıyorsanız ESP (EFI Sistem Bölümü) kendiliğinden "
 "algılanacak veya henüz mevcut değilse oluşturulacak ve /boot/EFI üzerine "
@@ -1750,13 +1783,14 @@ msgstr ""
 "denetlenmesini sağlayan tek seçenektir."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "GPT disk ile bir Eski ( ayrıca CSM veya BIOS olarak da bilinir) sistem "
 "kullanıyorsanız, mevcut değilse bir Bios disk bölümü oluşturmalısınız. Bu, "
@@ -1766,7 +1800,7 @@ msgstr ""
 "dosya sistemi türü olarak BIOS önyükleme disk bölümünü seçin."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1777,7 +1811,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1786,15 +1820,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "Bazı yeni sabit diskler eski standart olan 512 bayt mantıksal sektör yerine "
 "4096 bayt mantıksal sektör kullanmaktadır. Erişilebilir donanım eksikliği "
@@ -1805,19 +1840,22 @@ msgstr ""
 "öneririz. Şu ayarları kullanın: "
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "\"MIB\" \"için Hizala\""
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "\"Önündeki boş alan (MiB):\" \"2\""
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Ayrıca tüm bölümlerin çift sayılı megabaytlar ile oluşturulduğundan emin "
 "olun."
@@ -1828,7 +1866,7 @@ msgid "Installation from LIVE medium"
 msgstr "ÇalışanCD ortamından kurulum"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1843,18 +1881,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia Resmi Belgeleri"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1866,7 +1904,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1878,7 +1916,7 @@ msgstr ""
 "CMS</link> yardımıyla hazırlanmıştır."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1891,13 +1929,13 @@ msgstr ""
 "irtibat kurun."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1909,26 +1947,34 @@ msgstr ""
 "bağlıdır."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "DrakX ile kurulum"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Şubat 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1936,7 +1982,7 @@ msgstr "Tebrikler"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1945,7 +1991,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1956,16 +2002,17 @@ msgstr ""
 "başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Yeniden başlatmadan sonra, önyükleme ekranında, bilgisayarınızdaki (birden "
 "fazla varsa) işletim sistemleri arasında seçim yapabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1974,12 +2021,12 @@ msgstr ""
 "seçilecek ve başlatılacaktır."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Tadını çıkarın!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1994,11 +2041,12 @@ msgstr "Güvenlik duvarı"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "Bu kısım bazı basit güvenlik duvarı kurallarını ayarlamanızı sağlar: bunlar, "
 "hedef sistem tarafından İnternetten alınan ne tür iletilerin kabul "
@@ -2007,15 +2055,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "Öntanımlı ayarda herhangi bir kutucuk işaretli değildir - sistemdeki hiç bir "
 "hizmete ağ üzerinden erişilemez. \"<emphasis>Herşey (güvenlik duvarı yok)</"
@@ -2028,10 +2077,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Diğer tüm işaretleme düğmeleri az çok kendini açıklayıcıdır. Mesela, "
 "makinenize bağlı yazıcılara ağ üzerinden erişilmesini istiyorsanız \"CUPS "
@@ -2044,12 +2094,11 @@ msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "İşaretleme kutucukları sadece çok kullanılan hizmetleri sıralar. \"Gelişmiş"
 "\" düğmesi, işaretleme kutucuğu olmayan bir hizmete karşılık gelen iletilere "
@@ -2058,12 +2107,12 @@ msgstr ""
 "etkinleştirmenizi sağlar."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;port-numarasır>/&lt;protokol></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2074,7 +2123,7 @@ msgstr ""
 "(mesela RSYNC hizmeti için 873);"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2084,7 +2133,7 @@ msgstr ""
 "protokolüdür."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2093,7 +2142,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis> olur."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2102,7 +2151,7 @@ msgstr ""
 "ayrı girdi oluşturmanız gerekir."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Biçimlendirme"
 
@@ -2111,14 +2160,14 @@ msgstr "Biçimlendirme"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -2128,23 +2177,24 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "Burada hangi disk bölüm(ler)ini biçimlendirmek istediğinizi seçebilirsiniz. "
 "Biçimlendirme için <emphasis>seçilmemiş</emphasis> tüm bölümlerdeki veri "
 "korunacaktır."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Genellikle, DrakX tarafından seçilen bölümlerin biçimlendirilmesi gerekir"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2153,12 +2203,13 @@ msgstr ""
 "seçmek için <guibutton>Gelişmiş</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Doğru seçimi yaptığınızdan emin değilseniz, <guibutton>Geri</guibutton> ve "
 "yine <guibutton>Geri</guibutton> düğmesine tıklayabilir ve sonra "
@@ -2167,7 +2218,7 @@ msgstr ""
 "görüntülemeyi seçebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2176,12 +2227,12 @@ msgstr ""
 "guibutton> düğmesini tıklayın."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Kurulum Aracı"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2192,7 +2243,7 @@ msgstr ""
 "yapmanıza yardımcı olmak için tasarlanmıştır."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2201,36 +2252,40 @@ msgstr ""
 "tüm ihtiyacınızı karşılayacak, kurulum aracını başlatacaktır."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Kurulum Karşılama Ekranı"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "Bir Mageia DVD kullanarak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Burada bir Mageia DVD kullanıldığında öntanımlı karşılama ekranları "
 "bulunmaktadır. İlki UEFI sistemi ikincisi ise Eski sistemi göstermektedir:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "Bu ekrandan \"e\" harfine basarak \"düzenleme kipi\"ne girip çeşitli "
 "seçeneklere erişebilirsiniz. Bu ekrana geri dönmek için ya kaydetmeden "
@@ -2238,116 +2293,109 @@ msgstr ""
 "veya \"F10\" anahtarına basın."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "Bu ekranda bazı kişisel seçenekler ayarlanabilir:"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:45
-msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
-msgstr ""
-"F2 (sadece eski sistemlerde) tuşuna basarak (sadece kurulumda görüntülenecek "
-"olan ve sonradan bir başkasının sistem için ayarlanabileceği) dili "
-"seçebilirsiniz"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+"From this screen, it is possible to set some preferences (note that the "
+"options <emphasis role=\"bold\">F1</emphasis> to <emphasis role=\"bold\">F6</"
+"emphasis> are available only on Legacy systems):"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Ok tuşlarını kullanarak dili seçin ve Enter tuşuna basın."
+msgid ""
+"Within any of the <emphasis role=\"bold\">F2</emphasis> to <emphasis role="
+"\"bold\">F6</emphasis> options, you can view relevant help by pressing "
+"<emphasis role=\"bold\">F1</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:63
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Mesela burada, bir ÇalışanCD/DVD kullanımındaki Fransızca karşılama ekranı "
-"bulunmaktadır. ÇalışanCD/DVD menüsünün şunlar önermeyeceğini unutmayın: "
-"<guilabel>Sistemi Kurtar</guilabel>, <guilabel>Bellek Sınaması</guilabel> ve "
-"<guilabel>Donanım Algılama Aracı</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#: en/installer.xml:67
+msgid ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
+msgstr "Ok tuşlarını kullanarak dili seçin ve Enter tuşuna basın."
+
+#. 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 ""
 "F3 (Sadece eski sistemlerde) tuşuna basarak ekran çözünürlüğünü değiştirin."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Bazı çekirdek seceneklerini eski kipte <emphasis role=\"bold\">F6</emphasis> "
-"tuşuna veya UEFI kipte <emphasis role=\"bold\">e</emphasis> tuşuna basarak "
-"ekleyebilirsiniz."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Öntanımlı, öntanımlı seçeneklerden hiçbirinde değişiklik yapmaz."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Kurulum başarısız olursa, ek seçeneklerden birini kullanarak yeniden "
-"denemeniz gerekebilir. F6 tuşu ile çağrılan menü <guilabel>Önyükleme "
-"seçenekleri</guilabel> adlı yeni bir satır görüntüler ve dört girdi önerir:"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Öntanımlı, öntanımlı seçeneklerden hiçbirinde değişiklik yapmaz."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) Yok, güç yönetimi hesaba "
 "alınmaz."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- Yerel APIC (Yerel Gelişmiş Programlanabilir Kesme Denetleyicisi) Yok, bu "
 "seçenek işlemci kesmeleri ile ilgili olup sizden istendiğinde seçin."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2357,55 +2405,52 @@ msgstr ""
 "değiştirir."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "Bazı Mageia yayımlarında, F6 ile seçilen girdiler <guilabel>Önyükleme "
 "Seçenekleri</guilabel> satırında görüntülenmeyebilir; ancak aslında "
 "uygulanmaktadırlar."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"F1 tuşuna basarak daha fazla çekirdek seçeneği ekleyebilirsiniz (Sadece eski "
-"kipte)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "F1 tuşuna basarak daha fazla seçeneğe ulaşabilirsiniz. Bunlardan birini ok "
 "tuşları ile seçin ve Enter tuşuna basarak daha fazla bilgiye ulaşın veya Esc "
 "tuşuna basarak karşılama ekranına dönün."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Açılış resmi ile ilgili ayrıntılı görünüm. Esc tuşuna basarak veya "
 "<guilabel>Önyükleme Seçeneklerine Dön</guilabel> seçimi ile seçenekler "
@@ -2413,19 +2458,22 @@ msgstr ""
 "satırına elle eklenebilir."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "Yardım, F2 tuşu ile seçilen dile çevrilmiştir."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2436,80 +2484,47 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "Kablolu bir Ağ kullanarak"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Kablolu Ağ-temelli Kurulum CDsi (netinstall.iso veya netinstall-nonfree.iso "
-"imajları) kullanılırken görüntülenen öntanımlı karşılama ekranı budur:"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Dilin değiştirilmesine izin vermez, erişilebilir seçenekler ekranda "
-"tanımlanmıştır. Bir Kablolu Ağ-temelli Kurulum CDsini kullanmak hakkında "
-"daha fazla bilgi için <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">Mageia Wiki</link>sine bakın"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Klavye düzeni Amerikan düzenidir."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Kurulum adımları"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Kurulum işlemi, ekranın yanındaki panelden takip edilebilen bir kaç adıma "
 "bölünmüştür."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "Her adım, az gerek duyulan seçenekler için <guibutton>Gelişmiş</guibutton> "
 "düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "Çoğu ekran, geçerli adım için açıklamalar içeren <guibutton>Yardım</"
 "guibutton> düğmesine sahiptir."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2528,17 +2543,17 @@ msgstr ""
 "tuşlarına aynı anda basın."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Kurulum Sorunları ve Muhtemel Çözümleri"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Grafiksel Arabirim Yok"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2549,13 +2564,16 @@ msgstr ""
 "<code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Donanım çok eskiyse, grafiksel bir kurulum mümkün olmayabilir. Bu durumda "
 "metin tabanlı kurulumu denemelisiniz. Bunu kullanmak için, ilk karşılama "
@@ -2564,12 +2582,12 @@ msgstr ""
 "ENTER tuşuna basın. Şimdi kuruluma metin kipinde devam edin."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Kurulum Donuyor"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2584,14 +2602,15 @@ msgstr ""
 "seçeneklerle birlikte kullanılabilir."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "RAM sorunu"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2602,18 +2621,20 @@ msgstr ""
 "etmelidir. Mesela <code>mem=256M</code> 256MB RAM' i ifade eder."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Dinamik bölümler"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Eğer Microsoft Windows üzerinde sabit diskinizi \"temel\" biçimden \"dinamik"
 "\" biçime çevirdiyseniz, Mageia kuramazsınız. Temel diske geri dönmek için, "
@@ -2631,18 +2652,18 @@ msgstr "Güncellemeler"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2651,10 +2672,11 @@ msgstr ""
 "paketler güncellenmiş veya geliştirilmiş olabilir."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Bunları indirmek ve kurmak için <guilabel>evet</guilabel>' i; bunu yapmak "
@@ -2662,8 +2684,9 @@ msgstr ""
 "ı seçin."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "Sonra devam etmek için <guibutton>İleri</guibutton> düğmesine basın"
 
 #. type: Content of: <section><info><title>
@@ -2720,18 +2743,18 @@ msgstr "Veri Kaynağı Seçimi (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2743,7 +2766,7 @@ msgstr ""
 "adımlarda hangi paketleri seçebileceğinizi belirler."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2752,7 +2775,7 @@ msgstr ""
 "temel paketlerini içerir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2767,13 +2790,14 @@ msgstr ""
 "yazılımlarını içerir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "<emphasis>Tainted</emphasis> deposu, özgür yazılım altında yayımlanmış "
 "paketleri içerir. Bu depoya paketlerin konulmasındaki temel ölçüt, bunların "
@@ -2782,37 +2806,40 @@ msgstr ""
 "çözücüleri, ticari video DVD oynatmak için gerekli paketler v.b."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "En Ufak Kurulum"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Paket Grubu Seçimi ekranında, her şeyin seçimini kaldırarak En Ufak Kurulum "
 "yapmayı seçebilirsiniz. Bkz: <xref linkend=\"choosePackageGroups\"></xref>"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "İstediğiniz takdirde, ayrıca aynı ekrandaki \"Tek tek paket seçimi\" "
 "seçeneğini işaretleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "En Ufak Kurulum, <application>Mageia</application>'yı bir sunucu veya "
 "özelleştirilmiş iş istasyonu gibi belirli bir amaç için kullanmak isteyenler "
@@ -2821,25 +2848,24 @@ msgstr ""
 "kullanabilirsiniz. Bkz: <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Bu kurulum sınıfını seçerseniz ilgili ekran, belgelendirme ve X gibi bir kaç "
 "yararlı ek paketi kurmayı önerecektir."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Seçilirse, \"X ile\" ayrıca hafif masaüstü ortamı olarak IceWM de "
-"içerecektir."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2853,15 +2879,15 @@ msgstr ""
 "coreutils/manual/\">GNU coreutils</link> info sayfalarını içermektedir."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2878,11 +2904,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX algıladığı donanıma ve yaptığınız seçimlere bağlı olarak sisteminizin "
 "yapılandırması için en uygun seçimleri yaptı. Ayarları burada denetleyebilir "
@@ -2891,9 +2918,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Genel bir kural olarak, öntanımlı ayarlar önerilir ve bunları 3 istisna ile "
 "tutabilirsiniz:"
@@ -2910,72 +2938,76 @@ msgstr "öntanımlı ayar önceden denenmiş ve başarısız olması"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "aşağıdaki ayrıntılı bölümlerde farklı bir şeylerin söylenmiş olması"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Sistem parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zaman Dilimi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX tercih ettiğiniz dile bağlı olarak bir zaman dilimi seçti. Gerekirse "
 "bunu değiştirebilirsiniz. Ayrıca bakınız: <xref linkend="
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Ülke / Bölge</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Seçilen ülkede yaşamıyorsanız, bu ayarı düzeltmeniz çok önemlidir. Bkz: "
 "<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Önyükleyici</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX önyükleyici ayarı için iyi seçimler yaptı."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr ""
 "Grub2' yi nasıl yapılandıracağınızı bilmiyorsanız hiç bir şeyi değiştirmeyin"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "Daha fazla bilgi için bakınız: <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Kullanıcı yönetimi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2984,22 +3016,23 @@ msgstr ""
 "home</literal> dizinlerine sahip olacaklardır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Hizmetler</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Sistem hizmetleri, arka planda çalışan küçük uygulamaları (art süreçleri) "
 "işaret eder. Bu araç belirli görevleri etkinleştirmenizi veya devre dışı "
 "bırakmanızı sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3008,31 +3041,32 @@ msgstr ""
 "bilgisayarınızın düzgün işlemesini engelleyebilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "Daha fazla bilgi için bakınız: <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Donanım parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klavye</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "Burası; konumunuza, dilinize ve klavye türünüze bağlı olarak klavye "
 "düzeninizi ayarlayabileceğiniz yerdir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3041,12 +3075,12 @@ msgstr ""
 "parolanızın da değişeceğini unutmayın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Fare</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3055,39 +3089,40 @@ msgstr ""
 "ayarlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Ses kartı</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Kurulum aracı, varsa öntanımlı sürücüyü kullanır. Farklı bir sürücü seçeneği "
 "sadece kartınız için birden fazla sürücü varsa ve bunların hiç biri "
 "öntanımlı olan değilse sunulur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafiksel arabirim</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "Bu bölüm ekran kart(lar)ınızı ve görüntüleme araçlarınızı ayarlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "Daha fazla bilgi için bakınız: <xref linkend=\"configureX_chooser\"/>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3096,20 +3131,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Ağ ve İnternet parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Ağ</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3119,21 +3155,22 @@ msgstr ""
 "application>'nde ayarlamanız iyi olacaktır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Bir ağ kartı eklediğinizde güvenlik duvarının bu ara birimi izlemesini "
 "ayarlamayı unutmayın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Vekil Sunucular</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3144,26 +3181,27 @@ msgstr ""
 "bilgisayarınızı yapılandırmanıza olanak sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Buraya girmeniz gereken parametreleri almak için sistem yöneticinize "
 "danışmanız gerekebilir"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Güvenlik"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Güvenlik Düzeyi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3172,17 +3210,17 @@ msgstr ""
 "durumda öntanımlı ayar (Standart) genel kullanım için yeterlidir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "Kullanımınız için en uygun seçeneği işaretleyin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Güvenlik Duvarı</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3191,7 +3229,7 @@ msgstr ""
 "çalmaya uğraşan çakallar arasında duvar oluşturmaktadır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3202,7 +3240,7 @@ msgstr ""
 "<xref linkend=\"firewall\"/> kısmına bakın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Her şeye izin vermenin (güvenlik duvarı yok) çok riskli olabileceğini "
@@ -3273,40 +3311,73 @@ msgstr ""
 "kurulumu için küçültüleceğini seçin."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Güvenlik Seviyesi"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Disk bölümü boyutlandırma:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "Güvenlik seviyenizi burada ayarlayabilirsiniz."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Gelişmiş</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Neyi seçeceğinizi bilmiyorsanız, ön tanımlı ayarları olduğu gibi bırakın."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Kurulumdan sonra, istediğiniz zaman güvenlik ayarlarınızı Mageia Denetim "
 "Merkezi'ndeki <guilabel>Güvenlik</guilabel> bölümünden yapabilirsiniz."
@@ -3323,25 +3394,27 @@ msgstr "Giriş"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Mageia, ISO kalıp dosyaları yoluyla dağıtılmaktadır. Bu sayfa ihtiyaçlarınız "
 "doğrultusunda hangi kalıp dosyasını seçeceğinize yardımcı olacaktır."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "İki tür kurulum ortamı mevcuttur:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Klasik Kurulum Aracı: Kurulum ortamı başlatıldıktan sonra ne kuracağınızı ve "
 "hedef sisteminizi nasıl yapılandıracağınızı seçmenizi sağlayan bir süreç "
@@ -3349,82 +3422,85 @@ msgstr ""
 "Masaüstü Ortamını kuracağınız hususunda en fazla esnekliği sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"ÇalışanCD Kurulum Ortamı: Muhtemel bir kurulum sonrasında nasıl bir sistem "
-"olacağını görmek için gerçek bir Mageia sistemini bilgisayarınıza kurmaya "
-"gerek kalmadan başlatabilirsiniz. Kurulum süreci daha basittir ancak daha az "
-"seçeneğiz mevcuttur."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Ayrıntılar ilerleyen bölümlerde verilmiştir."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Ortam"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Açıklama"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Burada sözü edilen ortam, Mageia'yı kurmaya ve/veya yükseltmeye olanak "
 "sağlayan bir ISO imaj dosyasıdır ve herhangi bir fiziksel desteğe bağlı "
 "olarak kopyalanan ISO dosyasıdır."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Ortamları <link ns4:href=\"http://www.mageia.org/en/downloads/\">burada</"
 "link> bulabilirsiniz."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Klasik kurulum ortamı"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Ortak özellikler"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "Bu ISO'lar drakx denilen geleneksel yükleyiciyi kullanırlar."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr "Önceki sürümden yükseltme veya temiz bir kurulum yapabilirler."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "32 veya 64 bit mimari için farklı ortamlar."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3433,113 +3509,118 @@ msgstr ""
 "araçları mevcuttur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Her bir DVD birçok masaüstü ortamı ve dil içermektedir."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Size, kurulum sırasında özgür olmayan yazılım eklemek için seçenek sunulacak."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Canlı Ortam"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Sabit disk üzerine kurulum yapmadan kullanılabilir, istenirse sabit disk "
 "üzerine Mageia kurulur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "Her bir ISO yalnız bir masaüstü ortamı içerir (Plasma, Gnome veya Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Canlı ISO'lar yalnız temiz bir kurulum yapmak için "
 "kullanılabilir, bir önceki sürümden yükseltme yapmak için kullanılamazlar.</"
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Özgür olmayan yazılım içerirler."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Canlı DVD Plasma"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Yalnız Plasma masaüstü ortamı."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Tüm diller mevcuttur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Sadece 64 bit mimari."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Canlı DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Yalnız GNOME masaüstü ortamı."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Sadece 64 bit mimari"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Canlı DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Yalnız Xfce masaüstü ortamı."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32 veya 64 bit mimari."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Boot-only CD ortamı"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3549,28 +3630,30 @@ msgstr ""
 "içermeyen küçük bir imajdır."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Bu ortamlar çok hafiftir (100 MB'dan az) ve USB bellekten önyükleme "
 "yapılamadığında, bir DVD sürücüsü yoksa veya  bir DVD indirmek için bant "
 "aralığınız çok düşükse uygundur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Yalnız İngilizce."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3604,11 +3687,12 @@ msgstr "İndirme"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "ISO dosyanızı seçer seçmez dosyayı http veya BitTorrent kullanarak "
 "indirebilirsiniz. Her iki durumda da kullanılan yansı ve bant genişliği azsa "
@@ -3622,10 +3706,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum ve sha1sum araçları ISO kalıbının bütünlüğünü denetlemeye yarayan "
 "araçlardır. Sadece bunlardan birini kullanın. Yine bunlardan birini <link "
@@ -3639,8 +3724,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Sabit diske kaydet seçeneğini işaretleyin."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3648,14 +3733,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "İndirilen ortamın bütünlüğünü kontrol etme"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Her sağlama toplamı, indirilecek dosyadan bir algoritma tarafından "
 "hesaplanan onaltılık sayılardan oluşur. Bu algoritmalara indirdiğiniz "
@@ -3666,71 +3752,86 @@ msgstr ""
 "onarmanız gerektiği anlamına gelmektedir. "
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr ""
 "Konsolu açın -root olmanıza gerek yok- ve aşağıdaki komutlardan birini "
 "kullanın:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "md5sum kullanmak için: [sam@localhost]$ <userinput>md5sum imaj/dosyasının/"
 "bulunduğu/yol/dosyaadı.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "sha1sum kullanmak için: [sam@localhost]$ <userinput>sha1sum imaj/dosyasının/"
 "bulunduğu/yol/dosyaadı.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"ve Mageia'nın verdiği numara ile bilgisayarınızda elde ettiğiniz bu numarayı "
-"(Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"ve Mageia'nın verdiği numara ile bilgisayarınızda elde ettiğiniz bu numarayı "
+"(Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "ISO yakma veya atma"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Kontrol edilen ISO artık bir CD, DVD üzerine yakılabilir veya USB bellek "
 "üzerine aktarılabilir. Bu işlemler basit bir kopya değildir amaç "
 "çalıştırılabilir bir ortam yapmaktır."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Bir CD/DVD üzerine ISO yakma"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Dilediğiniz herhangi bir yakma aracını kullanın fakat yakma aygıtının bir "
 "<emphasis role=\"bold\">imaj yakmak</emphasis> için doğru ayarlandığından "
@@ -3739,12 +3840,12 @@ msgstr ""
 "\">buradaki Mageia wiki sayfasına</link> bakınız."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Bir USB bellek üzerine ISO atmak"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3753,18 +3854,19 @@ msgstr ""
 "sistemi önyükleme ve kurulum için kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "Bir flash aygıt üzerine bir imaj atma aygıt üzerindeki var olan herhangi bir "
 "dosya sistemini tahrip eder. Üzerindeki veriler silinir ve bölüm kapasitesi "
 "imaj boyutuna indirgenir."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3773,12 +3875,12 @@ msgstr ""
 "yeniden biçimlendirmelisiniz."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Mageia üzerinde bir grafiksel araç kullanarak"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3788,73 +3890,72 @@ msgstr ""
 "bir araç kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Windows üzerinde bir grafiksel araç kullanarak"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Deneyebilecekleriniz:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> \"ISO "
 "imajı\" seçeneğini kullanarak;"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Bir GNU/Linux sistem üzerinde komut satırını kullanarak"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Bunu elle gerçekleştirmeniz *tehlikeli* olabilir. Aygıt kimliğini yanlış "
 "girerseniz bir disk bölümünün üzerin yazmanız ihtimali vardır."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Ayrıca konsolda dd aracını da kullanabilirsiniz:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Konsolu açın"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "<userinput>su -</userinput> komutu ile root olun (sonundaki \"-\" işareti "
 "unutmayın)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3864,28 +3965,41 @@ msgstr ""
 "gelmektedir)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "<userinput>fdisk -l</userinput> komutunu girin"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
+msgid ""
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"USB belleğinizin (boyutundan) aygıt adını bulun. Örneğin yukarıdaki ekran "
+"görüntüsündeki 8 GB USB belleğin aygıt adı <code>/dev/sdb</code> olarak "
+"görünüyor."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Ek olarak, aygıt adını <code>dmesg</code> kotumu ile elde edebilirsiniz: en "
 "sonda, <emphasis>sd</emphasis> ve şu durumda <emphasis>sdd</emphasis> ile "
 "başlayan aygıt adını görürsünüz:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3927,47 +4041,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"USB belleğinizin (boyutundan) aygıt adını bulun. Örneğin yukarıdaki ekran "
-"görüntüsündeki 8 GB USB belleğin aygıt adı <code>/dev/sdb</code> olarak "
-"görünüyor."
+#: en/SelectAndUseISOs2.xml:317
+#, fuzzy
+msgid "<placeholder type=\"screen\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Şu komutu girin: # <userinput>dd if=/iso/dosyasının/yolu of=/dev/sdX bs=1M</"
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "X= aygıtınızın adıdır. örn: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Örneğin: # <userinput>dd if=/home/kullanıcıAdı/Downloads/Mageia-6-x86_64-DVD."
 "iso of=/dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Şu komutu girin: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3997,19 +4119,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Ülkeniz listede yer almıyorsa, <guilabel>Diğer Ülkeler</guilabel> düğmesine "
 "tıklayın ve ülkenizi/bölgenizi orada seçin."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Ülkeniz sadece <guilabel>Diğer Ülkeler</guilabel> listesindeyse; "
@@ -4018,18 +4142,19 @@ msgstr ""
 "seçiminizi uygulayacaktır."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Girdi yöntemi:"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "<guilabel>Diğer Ülkeler</guilabel> ekranında ayrıca bir girdi yöntemi "
@@ -4040,11 +4165,13 @@ msgstr ""
 "kaynağı ayarlanmışsa kurulabilirler."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Kurulum sırasında girdi yöntemi kurulumunu atlamışsanız; bu işleve, "
 "kurduğunuz sistemi başlattıktan sonra \"Bilgisayarınızı Yapılandırın\" -> "
@@ -4052,56 +4179,54 @@ msgstr ""
 "erişebilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Kurulum veya Yükseltme"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Kurulum"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Bu seçeneği taze bir <application>Mageia</application> kurulumu yapmak için "
-"kullanın."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Yükseltme"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Sisteminizde bir veya daha fazla <application>Mageia</application> "
-"kurulumunuz mevcutsa, kurulum aracı bunlardan birini en son sürüme "
-"yükseltmeye izin verecektir."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Bu kurulum aracı sürümü yayınlandığında denenmiş olan ve <emphasis>halen "
 "desteklenen</emphasis> sadece bir önceki Mageia sürümünden yükseltme "
@@ -4111,16 +4236,17 @@ msgstr ""
 "olacaktır."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Kurulum sırasında kurulumu durdurmak isterseniz, bilgisayarı yeniden "
 "başlatmak mümkündür; ancak bunu yapmadan önce iki kez düşünün. Bir disk "
@@ -4133,12 +4259,14 @@ msgstr ""
 "aynı anda basın."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Ek bir dil seçmeyi unuttuğunuzu fark ettiyseniz, \"Kurulum veya Yükseltme\" "
 "ekranından <guilabel>Alt Ctrl Home</guilabel> tuşlarına aynı anda basarak "
@@ -4173,12 +4301,12 @@ msgstr ""
 "seçilmiştir."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Klavye"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4187,16 +4315,17 @@ msgstr ""
 "tanımlı olan US klavye düzenini seçecektir."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4213,22 +4342,24 @@ msgstr ""
 "Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Klavyeniz listede gösterilmemişse, <guibutton>Ayrıntı</guibutton> düğmesine "
 "tıklayarak tam listeye ulaşabilir ve klavyenizi oradan seçebilirsiniz."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "<guibutton>Ayrıntı</guibutton> kısmında bir klavye seçtikten sonra ilk "
 "klavye seçimi ekranına döndürülürsünüz. Burada bir klavye seçimi yapılmış "
@@ -4236,23 +4367,24 @@ msgstr ""
 "edebilirsiniz: Klavyeniz. listeden seçtiğiniz klavye olarak ayarlanacaktır."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Latin alfabesi temelli olmayan bir klavye seçerseniz ek bir ekranda Latin ve "
 "Latin temelli olmayan klavye düzenleri arasında nasıl geçiş yapmak "
 "istediğiniz sorulur."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Lütfen kullanacağınız dili seçiniz"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4263,7 +4395,7 @@ msgstr ""
 "sistemde bu seçimi kullanacaktır."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4272,12 +4404,13 @@ msgstr ""
 "sırasında ve kurulumu tamamlanmış sistemde bu seçimi kullanacaktır."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Sisteminizde kendiniz veya diğer kullanıcılar için başka dillerin de kurulu "
 "olması gerekiyorsa, bunları şimdi eklemek için <guibutton>Çoklu dil</"
@@ -4285,7 +4418,7 @@ msgstr ""
 "olacaktır."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4298,18 +4431,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Birden çok dil seçmiş bile olsanız, bunlardan birini ilk dil ekranında "
 "tercih edilen dil olarak belirlemelisiniz. Seçtiğiniz bu dil çoklu dil "
 "ekranında da işaretli olacaktır ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4318,23 +4452,24 @@ msgstr ""
 "dili de kurmanız önerilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia, öntanımlı olarak UTF-8 (Unicode) desteğini kullanır."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Bunun diliniz için uygun olmadığını düşünüyorsanız \"çoklu dil\" ekranında "
 "devre dışı bırakabilirsiniz. UTF-8 devre dışı bırakıldığında tüm kurulu "
 "diller için de devre dışı bırakılmış olur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4389,65 +4524,70 @@ msgstr ""
 "seçeneğini seçin."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Bunu yapmak için /boot/grub2/custom.cfg dosyasını elle düzenlemeli veya "
 "Mageia veri kaynaklarında bulunan grub-customizer yazılımını kullanmalısınız."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr "Daha fazla bilgi için wiki sayfamızı okuyun: "
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Önyükleyici arayüzü"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Öntanımlı olarak Mageia sadece şunu kullanır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr "Eski/MBR veya Eski/GPT sistem için Grub2 (grafiksel menü ile/olmadan) "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Bir UEFI sistem için Grub2-efi"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia grafik menüleri güzeldir :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Eski/MBR ve Eski/GPT sistemler üzerinde Grub2"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4460,29 +4600,34 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Ne yaptığınızı gerçekten bilmediğiniz sürece \"Önyükleme Aygıtı\"nı "
 "değiştirmeyin."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "UEFI sistemler üzerinde Grub2-efi"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Bir UEFI sistemde kullanıcı arayüzü biraz farklıdır çünkü grafiksel menünün "
 "bulunması veya bulunmaması arasında tercihte bulunamazsınız"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4495,14 +4640,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Mageia bilgisayarınıza kurduğunuz tek sistemse, kurulum aracı önyükleyiciyi "
@@ -4514,38 +4660,43 @@ msgstr ""
 "işletim sistemi kurulu olursa olsun biri yeterlidir."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Bir Mageia önyükleyicisi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr ""
 "Öntanımlı olarak, sisteminize uygun biçimde Mageia şunlardan birini yeni "
 "olarak yazar:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "Ya ilk sabit diskinizdeki MBR (Birincil Önyükleme Kaydı) içine veya BIOS "
 "disk bölümüne GRUB2 önyükleyicisi"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "ESP içine Grub2-efi önyükleyicisi"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Zaten bir işletim sistemi kuruluysa, Mageia bunları yeni Mageia önyükleme "
 "menünüze eklemeyi dener. Bu davranışı istemiyorsanız <guibutton>İleri</"
@@ -4553,7 +4704,7 @@ msgstr ""
 "guilabel> kutucuğundaki işareti kaldırın."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4566,18 +4717,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Mevcut bir önyükleyiciyi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Mageia sisteminizi mevcut bir önyükleyiciye eklemek için gerekli tam süreç, "
 "bu yardımını hedeflerinin ötesindedir. Ancak yine de bir çok durumda ilgili "
@@ -4586,16 +4738,17 @@ msgstr ""
 "bakın."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Zincirleme yükleme kullanılıyor"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Önyüklenebilir bir Mageia istemiyor fakat bir başka işletim sisteminden "
 "zincirleme yüklenmesini istiyorsanız, <guibutton>İleri</guibutton> ve "
@@ -4603,7 +4756,7 @@ msgstr ""
 "MBR'ye dokunma</guibutton> kutucuğunu işaretleyin."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4616,7 +4769,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4625,7 +4778,7 @@ msgstr ""
 "<guibutton>Tamam</guibutton> düğmesine tıklayarak atlayın."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4634,33 +4787,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Seçenekler"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "İlk sayfa"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Öntanımlı görüntünün yüklemesinden önceki gecikme</guilabel>: Bu "
 "metin kutusu  öntanımlı işletim sistemi başlatılmadan önceki gecikme "
 "süresini saniye cinsinden ayarlamanızı sağlar."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guibutton>Güvenlik</guibutton>: Önyükleyici için bir parola ayarlamanızı "
 "sağlar. Böylece önyükleme sırasında önyükleme girdisini seçmek veya ayarları "
@@ -4668,37 +4822,37 @@ msgstr ""
 "\" ve parola da burada seçilendir."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Parola</guilabel>: Bu metin kutusu parolanızı oluşturacağınız "
 "kısımdır"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Parola (tekrar)</guilabel>: Parolanızı yeniden yazın. Böylece "
 "Drakx üstte yazılan parola ile uyuşup uyuşmadığını denetler."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Gelişmiş</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>ACPI özelliğini etkinleştir:</guilabel> ACPI (Gelişmiş "
 "Yapılandırma ve Güç Arabirimi) bir güç yönetimi standardıdır. Kullanılmayan "
@@ -4709,21 +4863,22 @@ msgstr ""
 "sistem kilitlenmeleri) yol açtığını düşünüyor olabilirsiniz."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>SMP özelliğini etkinleştir</guilabel>: Bu seçenek, çok çekirdekli "
 "işlemcilerde simetrik çoklu işlemeyi etkinleştirir veya devre dışı bırakır."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>APIC özelliğini etkinleştir</guilabel>: Bunu etkinleştirmek "
 "işletim sisteminin Gelişmiş Programlanabilir Kesme Denetleyicisi-APIC-ne "
@@ -4731,28 +4886,29 @@ msgstr ""
 "Gelişmiş IRQ (Kesme Talebi) yönetimine izin verir."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Yerel APIC özelliğini etkinleştir</guilabel>: Burada, bir SMP "
 "sistemde belli bir işlemci için tüm dış kesmeleri yöneten yerel APIC "
 "özelliğini ayarlayabilirsiniz. "
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Sonraki sayfa"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Öntanımlı:</guilabel> Öntanımlı olarak başlatılacak işletim sistemi"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4762,7 +4918,7 @@ msgstr ""
 "sağlar."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4772,18 +4928,19 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Ekran kipi:</guilabel> Bu seçenek, önyükleme menüsünün kullanacağı "
 "ekran boyutunu ve renk derinliğini ayarlar. Aşağı yönlü üçgene "
 "tıkladığınızda daha fazla boyut ve renk derinliği seçenekleri önerilir."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4793,7 +4950,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "SCSI Kur"
 
@@ -4806,36 +4963,39 @@ msgstr "SCSI Kur"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "DrakX genellikle sabit diskleri doğru olarak algılar. Bazı eski SCSI "
 "denetleyicileri söz konusu olduğunda kullanılacak doğru sürücüleri "
 "belirlemekte başarısız olabilir ve diski algılayamayabilir."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Bu durum gerçekleşirse, Drakx' e hangi SCSI disklerinizin olduğunu elle "
 "belirtmeniz gerekecektir."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX bundan sonra diskleri doğru olarak yapılandırabilecektir."
 
@@ -4856,10 +5016,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "Bu ekranda kurulum aracının ses kartınız için seçtiği ve varsa öntanımlı "
 "sürücünün ismi sunulur."
@@ -4881,10 +5041,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Sonra, draksound' da veya \"Ses Yapılandırması\" araç ekranında, "
 "<guibutton>Gelişmiş</guibutton> düğmesine ve ondan sonra da <guibutton>Sorun "
@@ -4892,32 +5054,35 @@ msgstr ""
 "önerileri bulabilirsiniz."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Gelişmiş"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Kurulum sırasında bu ekranda <guibutton>Gelişmiş</guibutton> düğmesine "
 "tıklamak öntanımlı bir sürücü yoksa ve erişilebilir başka sürücüler mevcutsa "
 "ve de kurulum aracının yanlış olanı seçtiğini düşünüyorsanız yararlıdır."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "Bu durumda <guibutton>Herhangi bir sürücü seçmeme izin ver</guibutton> "
 "düğmesine tıkladığınızda farklı bir sürücü seçebilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Biçimlendirilecek sabit diski onaylayın"
 
@@ -4928,13 +5093,13 @@ msgstr "Biçimlendirilecek sabit diski onaylayın"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4944,17 +5109,20 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Seçiminizden emin değilseniz <guibutton>Geri</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Eminseniz ve her disk bölümünü, her işletim sistemini ve sabit diskteki tümü "
 "veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
@@ -5079,16 +5247,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Mageia' yı Kaldırma"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Nasıl"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Mageia ihtiyaçlarınıza cevap vermediyse veya düzgün kurulamıyorsa yahut da "
@@ -5096,28 +5260,30 @@ msgstr ""
 "kendisinin bilgisayardan kaldırılması olanağını da size sunar. Böyle bir şey "
 "her işletim sistemi için geçerli değildir."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Verilerinizi yedekledikten sonra sonra Mageia DVD' nizi yeniden başlatmada "
 "kullanın ve Sistemi Kurtar seçeneği üzerinden Windows önyükleyiciyi geri "
 "yükle seçeneğini kullanın. Bir sonraki yeniden başlatmada, işletim sistemi "
 "seçmek üzere bir menü sunulmadan sadece Windows açılacaktır."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Windows üzerindeki Mageia disk bölümlerini geri getirmek için <code> Başlat -"
 "> Denetim Masası -> Yönetimsel Araçlar -> Bilgisayar Yönetimi -> Depolama -> "
@@ -5127,8 +5293,8 @@ msgstr ""
 "üzerinde sağ tıklayın ve <guibutton>Sil</guibutton> seçeneğini seçin. Disk "
 "alanı boşaltılacaktır."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5137,14 +5303,15 @@ msgstr ""
 "NTFS biçiminde) biçimlendirebilirsiniz. Disk bölümü harfini daha sonra "
 "alacaktır."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Vista veya 7 kullanıyorsanız, bir ihtimal daha var. Boş disk alanının "
 "solunda bulunan mevcut disk bölümünü uzatabilirsiniz. Daha başka disk "
@@ -5198,3 +5365,336 @@ msgstr ""
 "Bir sonraki adım, dosyaların sabit diske kopyalanmasıdır. Bu işlem biraz "
 "zaman alabilir. Sonunda, kısa süreliğine boş bir ekran ile "
 "karşılaşabilirsiniz fakat bu durum gayet olağandır."
+
+#~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Parola (yeniden)</guilabel>: Kullanıcı parolasını bu metin "
+#~ "kutusuna yeniden yazın ki drakx her bir kullanıcı parolası metin "
+#~ "kutusunda aynı parolanın bulunduğunu denetleyebilsin."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr ""
+#~ "Ek olarak, bir konuk hesabını etkinleştirebilir veya devre dışı "
+#~ "bırakabilirsiniz."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Öntanımlı bir <emphasis>rbash</emphasis> konuk hesabına sahip bir konuğun "
+#~ "kendi /home dizinine kaydettiği her şey oturumunu kapattığında silinir.   "
+#~ "Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Konuk hesabını etkinleştir</guilabel>: Burada bir konuk "
+#~ "hesabını etkinleştirebilir veya devre dışı bırakabilirsiniz. Konuk "
+#~ "hesabı, bir konuğunuzun bilgisayarda oturum açmasını ve kullanmasını "
+#~ "sağlar; ancak normal kullanıcılardan çok daha sınırlı erişim verir."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Grup Kimliği</guilabel>:  Bu, grup kimliğini ayarlamanızı "
+#~ "sağlar. Genellikle kullanıcınınki ile aynı olan bir rakamdır. Ne "
+#~ "yaptığınızı biliyorsanız boş bırakın."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "\"Aygıt\", şunları ifade eder: \"sabit disk\", [\"sabit disk numarası"
+#~ "\" (harf)] , \"disk bölümü numarası\" (mesela, \"sda5\")."
+
+#~ msgid "Workstation."
+#~ msgstr "İş İstasyonu."
+
+#~ msgid "Server."
+#~ msgstr "Sunucu."
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Grafiksel Ortam."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Dört grup vardır. Bir grubun önündeki ok işaretine tıklayarak grup "
+#~ "içindeki hizmetleri görüntüleyebilirsiniz."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Üretici listelerinde kartınızı (henüz veritabanına girmediği veya çok "
+#~ "eski bir kart olduğu için) bulamıyorsanız uygun bir sürücüyü Xorg "
+#~ "kategorisinde bulmanız mümkündür"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Algılanan her sabit disk veya USB bellek gibi diğer depolama aygıtı için "
+#~ "bir sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "Aşağıdaki kurallara göre kurulum aracı erişilebilir alanı paylaşır:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "\"MIB\" \"için Hizala\""
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "\"Önündeki boş alan (MiB):\" \"2\""
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "Bu ekranda bazı kişisel seçenekler ayarlanabilir:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "F2 (sadece eski sistemlerde) tuşuna basarak (sadece kurulumda "
+#~ "görüntülenecek olan ve sonradan bir başkasının sistem için "
+#~ "ayarlanabileceği) dili seçebilirsiniz"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Mesela burada, bir ÇalışanCD/DVD kullanımındaki Fransızca karşılama "
+#~ "ekranı bulunmaktadır. ÇalışanCD/DVD menüsünün şunlar önermeyeceğini "
+#~ "unutmayın: <guilabel>Sistemi Kurtar</guilabel>, <guilabel>Bellek "
+#~ "Sınaması</guilabel> ve <guilabel>Donanım Algılama Aracı</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Bazı çekirdek seceneklerini eski kipte <emphasis role=\"bold\">F6</"
+#~ "emphasis> tuşuna veya UEFI kipte <emphasis role=\"bold\">e</emphasis> "
+#~ "tuşuna basarak ekleyebilirsiniz."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Kurulum başarısız olursa, ek seçeneklerden birini kullanarak yeniden "
+#~ "denemeniz gerekebilir. F6 tuşu ile çağrılan menü <guilabel>Önyükleme "
+#~ "seçenekleri</guilabel> adlı yeni bir satır görüntüler ve dört girdi "
+#~ "önerir:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "F1 tuşuna basarak daha fazla çekirdek seçeneği ekleyebilirsiniz (Sadece "
+#~ "eski kipte)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "Kablolu bir Ağ kullanarak"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Kablolu Ağ-temelli Kurulum CDsi (netinstall.iso veya netinstall-nonfree."
+#~ "iso imajları) kullanılırken görüntülenen öntanımlı karşılama ekranı budur:"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Dilin değiştirilmesine izin vermez, erişilebilir seçenekler ekranda "
+#~ "tanımlanmıştır. Bir Kablolu Ağ-temelli Kurulum CDsini kullanmak hakkında "
+#~ "daha fazla bilgi için <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+#~ "iso_install\">Mageia Wiki</link>sine bakın"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Klavye düzeni Amerikan düzenidir."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Seçilirse, \"X ile\" ayrıca hafif masaüstü ortamı olarak IceWM de "
+#~ "içerecektir."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "Güvenlik seviyenizi burada ayarlayabilirsiniz."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Neyi seçeceğinizi bilmiyorsanız, ön tanımlı ayarları olduğu gibi bırakın."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "ÇalışanCD Kurulum Ortamı: Muhtemel bir kurulum sonrasında nasıl bir "
+#~ "sistem olacağını görmek için gerçek bir Mageia sistemini bilgisayarınıza "
+#~ "kurmaya gerek kalmadan başlatabilirsiniz. Kurulum süreci daha basittir "
+#~ "ancak daha az seçeneğiz mevcuttur."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Boot-only CD ortamı"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Sabit diske kaydet seçeneğini işaretleyin."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Ayrıca konsolda dd aracını da kullanabilirsiniz:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Bu seçeneği taze bir <application>Mageia</application> kurulumu yapmak "
+#~ "için kullanın."
+
+#~ msgid ""
+#~ "If you have one or more <application>Mageia</application> installations "
+#~ "on your system, the installer will allow you to upgrade one of them to "
+#~ "the latest release."
+#~ msgstr ""
+#~ "Sisteminizde bir veya daha fazla <application>Mageia</application> "
+#~ "kurulumunuz mevcutsa, kurulum aracı bunlardan birini en son sürüme "
+#~ "yükseltmeye izin verecektir."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Nasıl"
diff --git a/docs/docs/stable/installer/uk.po b/docs/docs/stable/installer/uk.po
index 17840de6..03d789d0 100644
--- a/docs/docs/stable/installer/uk.po
+++ b/docs/docs/stable/installer/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 20:39+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-26 20:33+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -24,12 +24,13 @@ msgstr "Умови ліцензування та нотатки щодо вип�
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -63,8 +64,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "Щоб погодитися з умовами, позначте пункт <guilabel>Прийняти</guilabel>, а "
@@ -87,9 +89,10 @@ msgstr "Нотатки щодо випуску"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Щоб ознайомитися із важливою інформацією щодо поточного випуску "
@@ -97,13 +100,13 @@ msgstr ""
 "випуску</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "uk"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Вибір носія (налаштовування додаткових носіїв пакунків для встановлення)"
@@ -112,23 +115,25 @@ msgstr ""
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "На цій сторінці буде наведено список визначених сховищ пакунків. Ви зможете "
 "додати інші джерела пакунків, зокрема оптичний носій даних або віддалений "
@@ -136,23 +141,25 @@ msgstr ""
 "доступними для вибору на наступних кроках."
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "Щоб додати джерело у інтернет, слід виконати два таких кроки:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "Вибір і вмикання мережі, якщо її ще не було увімкнено."
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "Вибір дзеркала або визначення адреси (перший запис). Після вибору дзеркала "
 "ви отримаєте доступ до вибору сховищ, які використовуються у Mageia, зокрема "
@@ -162,14 +169,15 @@ msgstr ""
 "NFS систему."
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "Якщо ви оновлюєте 64-бітову версію системи, де можуть міститися якісь 32-"
 "бітові пакунки, вам варто скористатися цією сторінкою для додавання сховища "
@@ -186,7 +194,7 @@ msgstr "Керування обліковими записами користу�
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -199,21 +207,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Встановлення пароля адміністратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "У кожній встановленій системі <application>Mageia</application> варто "
 "визначити пароль суперкористувача або адміністратора. Такий пароль у Linux "
@@ -224,25 +232,28 @@ msgstr ""
 "розташованому нижче, щоб упевнитися, що пароль було вказано без помилок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "Всі паролі слід вказувати з врахуванням регістру. Краще використовувати у "
 "паролі суміш літер (великих і малих), цифр та інших символів."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Введіть користувача"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "За допомогою цієї панелі ви можете додати користувачів. Кожен користувач має "
 "вужчі права доступу, ніж суперкористувач (root), але достатньо прав для "
@@ -250,7 +261,7 @@ msgstr ""
 "яких інших завдань, які виконуються звичайним користувачем за комп’ютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
@@ -259,7 +270,7 @@ msgstr ""
 "піктограму користувача."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
@@ -268,10 +279,11 @@ msgstr ""
 "вказати справжнє ім’я користувача."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>Ім’я користувача, що реєструється</guilabel>: тут ви можете ввести "
@@ -279,40 +291,43 @@ msgstr ""
 "версію справжнього імені користувача."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Пароль</guilabel>: у цьому полі вам слід вказати пароль "
 "користувача. Колір позначки щита поряд з цим полем відповідає складності "
 "пароля (див. також <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
 "<guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля користувача "
 "у цьому полі. drakx перевірить, чи збігається введений вами повторно пароль "
 "з його початковим варіантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "Вміст домашніх каталогів всіх користувачів, записи яких буде створено під "
 "час встановлення Mageia, буде захищено від читання і запису (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -322,65 +337,36 @@ msgstr ""
 "користувачами</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Права доступу до домашніх каталогів, звичайно ж, можна змінити і після "
 "завершення встановлення системи."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "Додаткові можливості керування записами користувачів"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "Якщо ви натиснете кнопку <guibutton>Додатково</guibutton>, програма відкриє "
 "діалогове вікно, за допомогою якого ви зможете змінити параметри облікового "
 "запису, який ви додаєте."
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr ""
-"Крім того, за допомогою цього діалогового вікна можна вимкнути або увімкнути "
-"гостьовий обліковий запис."
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"Будь-які дані, які буде записано з гостьового облікового запису "
-"<emphasis>rbash</emphasis> до відповідного каталогу у /home, буде витерто "
-"під час виходу з системи. Користувачеві гостьового облікового запису слід "
-"потурбуватися про збереження важливих файлів на портативний носій даних."
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>Увімкнути гостьовий запис</guilabel>: за допомогою цього пункту "
-"можна увімкнути або вимкнути гостьовий обліковий запис. Користувач "
-"гостьового облікового запису зможете увійти до системи, користуватися "
-"комп’ютером, але матиме обмежені права доступу навіть порівняно зі "
-"звичайними користувачами."
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Командна оболонка</guilabel>: за допомогою цього спадного списку "
 "ви можете змінити командну оболонку, яка використовуватиметься для роботи "
@@ -388,11 +374,12 @@ msgstr ""
 "Можливі такі варіанти: Bash, Dash та Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>Код користувача</guilabel>: тут ви можете встановити код "
 "(ідентифікатор) користувача, обліковий запис якого було додано за допомогою "
@@ -400,20 +387,14 @@ msgstr ""
 "поле, якщо вам невідомі наслідки ваших дій."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>Код групи</guilabel>: тут ви можете встановити код (ідентифікатор) "
-"групи користувача, обліковий запис якого було додано за допомогою "
-"попереднього вікна. Слід вказати номер, зазвичай той самий, що і для "
-"облікового запису користувача. Не заповнюйте це поле, якщо вам невідомі "
-"наслідки ваших дій."
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "Вибір точок монтування"
 
@@ -430,13 +411,14 @@ msgstr "Вибір точок монтування"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -446,7 +428,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -457,41 +439,45 @@ msgstr ""
 "application>, ви можете змінити точки монтування."
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "У разі внесення змін не забудьте, що серед розділів обов’язково має бути "
 "розділ <literal>/</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr ""
 "Для кожного з розділів буде показано такі дані: «Пристрій» («Місткість», "
 "«Точка монтування», «Тип»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"Для пункту «Пристрій» буде показано таке: «твердий диск», [«номер твердого "
-"диска»(літера)], «номер розділу» (наприклад, «sda5»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "Якщо у вашій системі багато розділів, за допомогою спадного меню ви зможете "
 "вибрати для них різні точки монтування, зокрема такі: <literal>/</literal>, "
@@ -502,20 +488,22 @@ msgstr ""
 "версії системи (cauldron)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr ""
 "Для розділів, доступ до яких за допомогою встановленої системи не "
 "здійснюватиметься, ви можете не вказувати точку монтування."
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "Натисніть кнопку <guibutton>Назад</guibutton>, якщо ви не певні, щодо "
 "вибору. Потім натисніть кнопку <guilabel>Спеціальний розподіл диска</"
@@ -523,7 +511,7 @@ msgstr ""
 "область розділу, щоб переглянути дані щодо типу і розміру розділу."
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -800,8 +788,9 @@ msgstr "Вибір стільниці"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr ""
 "Залежно від вибраного вами за допомогою цієї сторінки варіанта встановлення, "
@@ -810,8 +799,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -829,14 +819,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "Виберіть бажане для вас графічне середовище, <application>KDE</application> "
 "або <application>Gnome</application>. Обидва ці середовища об’єднують "
@@ -870,8 +862,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -883,32 +876,37 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "Робоча станція."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "Сервер"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "Графічне середовище."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr ""
 "Індивідуальний вибір пакунків: цим варіантом можна скористатися для "
 "додавання або вилучення пакунків вручну."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Ознайомтеся з розділом <xref linkend=\"minimal-install\"/>, де викладено "
@@ -916,31 +914,33 @@ msgstr ""
 "та IceWM)."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "Вибір окремих пакунків"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr ""
 "За допомогою цього варіанта ви можете вибрати додаткові пакунки, які "
 "доповнять встановлену вами систему, або вилучити пакунки, що є частиною "
 "типового набору."
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -956,47 +956,45 @@ msgstr ""
 "завантажити збережений файл."
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "Налаштування ваших служб"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr ""
 "За допомогою цієї сторінки ви можете визначити, які служби запускатимуться, "
 "а які ні, під час завантаження вашої системи."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
+#: en/configureServices.xml:19
+msgid "Click on a triangle to expand a group to all the relevant services."
 msgstr ""
-"Передбачено чотири групи служб. Щоб розгорнути список кожної з груп, "
-"натисніть кнопку з зображенням трикутника перед пунктом групи."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "Зазвичай, потреби у зміні налаштувань, вибраних DrakX, немає."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
@@ -1005,7 +1003,7 @@ msgstr ""
 "інформаційній панелі під списком."
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "Вносьте зміни, лише якщо вам добре відомі наслідки ваших дій."
 
@@ -1018,12 +1016,13 @@ msgstr "Налаштування часового поясу"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1033,9 +1032,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr ""
 "Виберіть ваш часовий пояс. Для цього достатньо вибрати вашу країну або якесь "
 "місто поруч з вашим місцем перебування так, щоб це місто було розташовано у "
@@ -1043,9 +1043,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr ""
 "За допомогою наступного розділу ви можете вказати режим роботи апаратного "
 "годинника комп’ютера: використання місцевого часу або часу за Гринвічем, "
@@ -1062,23 +1063,23 @@ msgstr ""
 "Всесвітній час (UTC/GMT)."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "Вибір графічного сервера (налаштовування вашої графічної картки)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
@@ -1087,7 +1088,7 @@ msgstr ""
 "програма може правильно визначити ваш графічний пристрій."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
@@ -1097,37 +1098,30 @@ msgstr ""
 "ієрархічного списку за такими критеріями:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "виробник"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "назва вашої картки"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "тип вашої картки"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"Якщо вашої картки немає у списку карток за виробниками (оскільки вона ще не "
-"встигла потрапити до бази даних або є надто старою), ви можете знайти "
-"відповідний драйвер у категорії «Xorg»."
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "У категорії «Xorg» ви зможете скористатися одним з понад 40 типових "
 "драйверів з відкритим кодом для відеокарт. Якщо вам все ж не вдасться знайти "
@@ -1135,63 +1129,67 @@ msgstr ""
 "забезпечує базові можливості з показу відео."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "Будьте уважними: якщо драйвер буде вибрано помилково, ви зможете отримати "
 "доступ лише до інтерфейсу командного рядка."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "Деякі виробники відеокарт самі створюють пропрієтарні (закриті) драйвери для "
 "Linux. Доступ до таких драйверів можна отримати лише за допомогою сховищ "
 "пакунків «Nonfree» або сайтів виробників карток."
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "Вам слід явним чином увімкнути сховища «Nonfree», щоб мати до них доступ. "
 "Зробити це слід після першого перезавантаження системи."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "Байдуже, яке графічне середовище (або стільничне середовище) було вибрано "
 "під час встановлення <application>Mageia</application>, всі ці середовища "
@@ -1204,7 +1202,7 @@ msgstr ""
 "помилковий вибір, або якщо вам здається, що цей вибір є помилковим."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1213,13 +1211,14 @@ msgstr ""
 "виберіть встановлену на вашому комп’ютері графічну картку зі списку."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>Монітор</guibutton></emphasis>: ви можете вибрати "
 "<guilabel>Plug'n Play</guilabel> якщо вважаєте, що це правильно, або вибрати "
@@ -1229,33 +1228,34 @@ msgstr ""
 "вертикаллю та горизонталлю для вашого монітора."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr ""
 "Помилково вказані частоти оновлення зображення можуть призвести до "
 "пошкодження вашого монітора."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>Роздільна здатність</guibutton></emphasis>: за "
 "допомогою цього пункту можна вибрати бажану роздільну здатність та глибину "
 "кольорів на вашому моніторі."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>Перевірити</guibutton></emphasis>: кнопка перевірки під "
 "час встановлення може бути недоступною. Якщо кнопка є доступною, за "
@@ -1269,7 +1269,7 @@ msgstr ""
 "були безпечними.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1278,12 +1278,12 @@ msgstr ""
 "пункту ви можете увімкнути або вимкнути різноманітні параметри."
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "Вибір монітора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
@@ -1292,12 +1292,13 @@ msgstr ""
 "правильно визначити ваш монітор."
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>Вибір пункту монітора з іншими апаратними характеристиками може "
 "призвести до пошкодження вашого монітора або відеоапаратури. Будь ласка, "
@@ -1305,23 +1306,23 @@ msgstr ""
 "до документації з вашого монітора."
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>Спеціальний</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1335,7 +1336,7 @@ msgstr ""
 "показано лінії зображення."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1348,12 +1349,12 @@ msgstr ""
 "документацією до вашого монітора."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>Plug 'n Play</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
@@ -1362,12 +1363,12 @@ msgstr ""
 "базою даних моніторів."
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>Виробник</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
@@ -1377,28 +1378,30 @@ msgstr ""
 "списку за такими критеріями:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "назва фірми-виробника монітора"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "опис монітора"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>Загальний</emphasis>:"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "якщо ви виберете цю групу, буде відкрито список з близько 30 типових "
 "налаштувань дисплеїв, подібних до 1024x768 @ 60 Гц, до якого включено "
@@ -1408,12 +1411,12 @@ msgstr ""
 "автоматично. Знову ж таки, варто параметри варто вибирати дуже обережно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1424,12 +1427,14 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "Якщо на вашому розділі з <literal>/</literal> ви хочете скористатися "
 "шифруванням, каталог <literal>/boot</literal> слід зберігати на окремому "
@@ -1437,11 +1442,12 @@ msgstr ""
 "завантаження системи стане неможливим."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "За допомогою цієї сторінки можна визначити компонування розділів у вашій "
 "системі. За її допомогою можна вилучати і створювати розділи, змінювати "
@@ -1449,32 +1455,32 @@ msgstr ""
 "розділів до внесення змін."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"Для кожного виявлено жорсткого диска або іншого носія даних (зокрема картки "
-"флеш USB) буде відведено власну вкладку. Приклад: sda, sdb та sdc, якщо буде "
-"виявлено три диски."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr ""
 "Натисніть кнопку <guibutton>Очистити все</guibutton>, щоб всі розділи на "
 "вибраному носії даних було вилучено."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "Щоб виконати будь-яку іншу дію, спочатку позначте область відповідного "
 "розділу. Потім перегляньте дані щодо розділу, змініть його файлову систему і "
@@ -1484,35 +1490,37 @@ msgstr ""
 "можливостей, зокрема додавання мітки або вибору типу розділу."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr ""
 "Повторюйте ці дії для всіх відповідних розділів, аж доки все не набуде "
 "потрібних вам обрисів."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Натисніть кнопку <guibutton>Виконано</guibutton>, коли налаштовування буде "
 "завершено."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Якщо ви встановлюєте Mageia у системах з UEFI, переконайтеся, що існує ESP "
 "(EFI System Partition) і що її змонтовано до /boot/EFI (див. нижче)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/></imageobject><imageobject condition=\"live"
@@ -1520,12 +1528,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
 "partition is present and of the correct type"
@@ -1534,7 +1542,7 @@ msgstr ""
 "існує розділ BIOS належного типу."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1547,32 +1555,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Розбиття на розділи"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "За допомогою цієї сторінки ви зможете переглянути вміст всіх дисків "
 "комп’ютера і ознайомитися з пропозиціями майстра поділу на розділи DrakX "
 "щодо місця встановлення <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr ""
 "Перелік пунктів у наведеному нижче списку залежатиме від комплектації "
 "комп’ютера та вмісту дисків."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1585,12 +1595,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "Користуватися існуючими розділами"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1599,12 +1609,12 @@ msgstr ""
 "Linux розділи, якими можна скористатися для встановлення системи."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "Використовувати вільний простір"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1613,12 +1623,12 @@ msgstr ""
 "достатнє для встановлення нової системи Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "Використовувати вільний простір на розділі Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1628,7 +1638,7 @@ msgstr ""
 "системи."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1639,7 +1649,7 @@ msgstr ""
 "створити резервні копії важливих для вас файлів!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1657,12 +1667,14 @@ msgstr ""
 "вас файлів."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "Якщо буде вибрано цей варіант, засіб встановлення покаже решту розділу "
 "Windows блакитним кольором, а майбутній розділ з Mageia — темно-синім. "
@@ -1671,38 +1683,40 @@ msgstr ""
 "нижче знімок екрана."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
+"\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "Стерти і використати весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr ""
 "У разі використання цього варіанта для встановлення Mageia буде використано "
 "весь об’єм на диску."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Зауваження: всіх дані на диску буде у такому разі витерто. Будьте обережні!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1712,12 +1726,12 @@ msgstr ""
 "не диску вже зберігаються якісь важливі дані, не користуйтеся цим варіантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 msgid "Custom disk partitioning"
 msgstr "Нетиповий поділ диска на розділи"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1726,69 +1740,83 @@ msgstr ""
 "розташування розділів на вашому диску відповідно до ваших уподобань."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
 msgstr ""
-"Засіб встановлення розподілити наявне місце відповідно до таких правил:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr ""
 "Якщо загалом доступного місця менше за 50 ГБ, буде створено лише один "
 "кореневий розділ, /, окремого розділу для /home створено не буде."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr ""
 "6/19 від доступного місця, але не більше за 50 ГБ, буде віддано розділу /"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19, але не більше за 4 ГБ, буде віддано розділу резервної пам’яті на диску "
 "(swap)"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "решту (принаймні 12/19) буде віддано розділу /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "Це означає, що якщо на диску 160 ГБ або більше вільного місця, засобом "
 "встановлення буде створено три розділи: 50 ГБ для /, 4 ГБ для резервної "
 "пам’яті на диску. Решту місця буде віддано під /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI, ESP (розділ із системою EFI) буде "
 "виявлено автоматично або створено, якщо його ще не існувало, і змонтовано "
@@ -1796,13 +1824,14 @@ msgstr ""
 "якщо виявлення UEFI було виконано належним чином."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
+#, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "Якщо ви користуєтеся застарілою системою (відомою як CSM або BIOS) із диском "
 "GPT, вам доведеться створити розділ для завантаження BIOS, якщо його ще не "
@@ -1813,7 +1842,7 @@ msgstr ""
 "тип файлової системи «Розділ завантаження BIOS»."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -1824,7 +1853,7 @@ msgstr ""
 "\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1833,15 +1862,16 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "У деяких новіших дисках використовуються логічні сектори у 4096 байтів "
 "замість попереднього стандарту у 512 байтів на логічний сектор. Через те, що "
@@ -1853,19 +1883,22 @@ msgstr ""
 "таких значень параметрів:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "«Вирівняти до» «МіБ»"
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "«Вільне місце перед (МіБ)» «2»"
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr ""
 "Також слід переконатися, що всі розділи буде створено з парними розмірами у "
 "мегабайтах."
@@ -1876,7 +1909,7 @@ msgid "Installation from LIVE medium"
 msgstr "Встановлення з носія LIVE"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1891,18 +1924,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Офіційна документація до Mageia"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1914,7 +1947,7 @@ 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:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1926,7 +1959,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1939,13 +1972,13 @@ msgstr ""
 "хочете допомогти у поліпшенні цього підручника."
 
 #. type: Content of: <article><info><cover><para><note>
-#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1957,26 +1990,34 @@ msgstr ""
 "вибраного вами варіанта встановлення."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Встановлення за допомогою DrakX"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "Лютий 2014 року"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1984,7 +2025,7 @@ msgstr "Вітаємо"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1993,7 +2034,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -2003,17 +2044,18 @@ msgstr ""
 "вилучати носій для встановлення системи і перезавантажувати ваш комп’ютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "Після перезавантаження за допомогою екрана завантаження ви зможете вибрати "
 "одну з операційних систем, встановлених на вашому комп’ютері (якщо "
 "встановлено декілька систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2022,12 +2064,12 @@ msgstr ""
 "запущено встановлену вами операційну систему Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Приємної роботи!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2042,11 +2084,12 @@ msgstr "Захисний шлюз"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
+#, fuzzy
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 "За допомогою цього розділу ви можете налаштувати прості правила роботи "
 "захисного шлюзу (брандмауера): вони визначають тип повідомлення з інтернету, "
@@ -2055,15 +2098,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
+#, fuzzy
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 "У типовому стані жоден із пунктів не позначено — жодна зі служб у системі не "
 "буде доступною з інтернету. Пункт <emphasis>Все (захисного шлюзу немає))</"
@@ -2076,10 +2120,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
+#, fuzzy
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 "Призначення усіх інших пунктів має бути більш-менш зрозумілим. Наприклад, "
 "позначте пункт «Сервер CUPS», якщо хочете, щоб принтери на вашому комп’ютері "
@@ -2092,12 +2137,11 @@ msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
+#, fuzzy
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 "У списку пунктів містяться лише найпоширеніші типи служб. За допомогою "
 "кнопки «Додатково» можна відкрити сторінку визначення служби, для якої не "
@@ -2105,12 +2149,12 @@ msgstr ""
 "набір служб на основі пар записів даних (відокремлених пробілами)."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>&lt;номер порту>/&lt;протокол></emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -2121,7 +2165,7 @@ msgstr ""
 "RSYNC). Номер визначається за протоколом <emphasis>RFC-433</emphasis>;"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
@@ -2131,7 +2175,7 @@ msgstr ""
 "використовуватиметься для обміну даними із службою."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
@@ -2140,7 +2184,7 @@ msgstr ""
 "<emphasis>873/tcp</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
@@ -2149,7 +2193,7 @@ msgstr ""
 "вказати дві пари записів для одного порту."
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "Форматування"
 
@@ -2158,40 +2202,41 @@ msgstr "Форматування"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
-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>"
+"<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>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "За допомогою цієї сторінки ви можете визначитися з тим, які розділи слід "
 "форматувати. Всі дані на розділах, які <emphasis>не</emphasis> позначено для "
 "форматування, буде збережено."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr ""
 "Зазвичай, форматування потрібне принаймні для розділів, вибраних DrakX."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -2200,12 +2245,13 @@ msgstr ""
 "слід перевірити на так звані <emphasis>пошкоджені блоки</emphasis>."
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "Якщо ви не певні щодо правильності свого вибору, ви можете натиснути кнопку "
 "<guibutton>Назад</guibutton>, ще раз кнопку <guibutton>Назад</guibutton>, а "
@@ -2214,7 +2260,7 @@ msgstr ""
 "параметри розділів."
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
@@ -2223,12 +2269,12 @@ msgstr ""
 "щоб продовжити роботу з програмою."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, програма для встановлення Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2239,7 +2285,7 @@ msgstr ""
 "оновлення системи якомога простішим для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2249,36 +2295,40 @@ msgstr ""
 "саме той пункт, який вам потрібен."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "Вітальне вікно програми для встановлення"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 msgid "Using a Mageia DVD"
 msgstr "За допомогою DVD Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "Нижче наведено типові вікна вітання DVD Mageia. Перше з них відповідає "
 "системі з UEFI, друге — системі із застарілою системою завантаження:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:31
+#: en/installer.xml:37
+#, fuzzy
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 "З цієї сторінки ви можете отримати доступ до параметрів, натиснувши клавішу "
 "«e» для входу до режиму редагування. Щоб повернутися з цього режиму, "
@@ -2286,122 +2336,116 @@ msgstr ""
 "клавіш Ctrl і F10, щоб зберегти зміни і вийти з режиму редагування."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:42
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "За допомогою цієї сторінки можна вказати деякі особисті уподобання:"
+#: 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:45
+#: 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 ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"Press <emphasis role=\"bold\">F2</emphasis> to have the installer use a "
+"specific language for the installation."
 msgstr ""
-"Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу "
-"мову) можна вибрати після натискання клавіші F2 (лише у застарілому режимі)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: 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><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr ""
 "Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
 "списку, і натисніть клавішу Enter."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
+#: en/installer.xml:77
+#, fuzzy
 msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"Нижче наведено приклад вікна вітання, перекладеного французькою, у "
-"портативній версії системи на DVD або компакти диску. Зауважте, що у меню "
-"портативної системи немає таких пунктів: <guilabel>Порятунок системи</"
-"guilabel>, <guilabel>Тест пам’яті</guilabel> та <guilabel>Інструмент пошуку "
-"обладнання</guilabel>."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr ""
 "Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3 "
 "(лише у застарілому режимі)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
+#: en/installer.xml:88
 msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
+"If you experience problems with the installation, you could try modifying "
+"the default settings using the <emphasis role=\"bold\">F6</emphasis> "
+"<emphasis role=\"bold\">Kernel Options</emphasis> (for UEFI systems press "
+"<emphasis role=\"bold\">e</emphasis> instead)."
 msgstr ""
-"Додати параметри роботи ядра можна натисканням клавіші <emphasis role=\"bold"
-"\">F6</emphasis> у режимі застарілої системи або клавіші <emphasis role="
-"\"bold\">E</emphasis> у режимі UEFI."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:96
+#, fuzzy
+msgid "Default: It doesn't alter anything in the default options."
+msgstr "- Default (типовий), не змінювати нічого у типових параметрах."
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
 msgstr ""
-"Якщо програмі для встановлення не вдається виконати своє призначення "
-"належним чином, ви можете повторити спробу, скориставшись додатковими "
-"варіантами. У меню, яке можна викликати натисканням клавіші F6, буде "
-"показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри "
-"завантаження</guilabel>) з такими чотирма підпунктами:"
+"- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
+"швидкодією."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
-msgstr "- Default (типовий), не змінювати нічого у типових параметрах."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr ""
 "- No ACPI (без розширеного інтерфейсу налаштовування та керування "
 "живленням), не брати до уваги параметри керування живленням."
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- No Local APIC (без локального розширеного контролера переривань з "
 "можливістю програмування), цей варіант пов’язано з перериваннями роботи "
 "центрального процесора, виберіть його, якщо маєте відповідні настанови."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2410,36 +2454,32 @@ msgstr ""
 "показаних у рядку <guilabel>Параметри завантаження</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "У деяких випусках Mageia параметри, вибрані за допомогою F6, не буде "
 "показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці "
 "параметри буде враховано під час завантаження системи."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr ""
-"Додаткові параметри роботи ядра можна вказати після натискання клавіші F1 "
-"(лише у застарілому режимі)."
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "Натискання клавіші F1 відкриває нове вікно зі списком пунктів. Виберіть один "
 "з пунктів за допомогою клавіш зі стрілками і натисніть клавішу Enter, щоб "
@@ -2447,19 +2487,20 @@ msgstr ""
 "вікна вітання."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "Нижче наведено знімок вікна з докладним описом параметрів вікна вітання "
 "системи. Натисніть клавішу Esc або виберіть пункт <guilabel>Return to Boot "
@@ -2468,21 +2509,24 @@ msgstr ""
 "<guilabel>Параметри завантаження</guilabel>."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr ""
 "Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
 "клавіші F2."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2492,62 +2536,27 @@ msgstr ""
 "можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options\">тут</link>."
 
-#. type: Content of: <section><section><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr "За допомогою дротової мережі"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"Нижче наведено типове вікно вітання образу для встановлення з дротової "
-"мережі (образ netinstall.iso або netinstall-nonfree.iso):"
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"Мову тут змінити не можна. Список доступних параметрів наведено на екрані. "
-"Докладніший опис використання образу для встановлення з мережі наведено у "
-"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">вікі Mageia</"
-"link>."
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "Розкладка клавіатури відповідає американській англійській."
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "Кроки встановлення"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr ""
 "Процедуру встановлення поділено на послідовність кроків, перелік яких буде "
 "показано на бічній панелі екрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "На кожному кроці вам буде показано одну або декілька сторінок, на яких ви "
 "можете побачити кнопку <guibutton>Додатково</guibutton> , за допомогою якої "
@@ -2555,20 +2564,22 @@ msgstr ""
 "часто як основними."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "На більшості сторінок ви також побачите кнопку <guibutton>Довідка</"
 "guibutton>, за допомогою якої можна отримати додаткові пояснення щодо "
 "поточного кроку."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2587,17 +2598,17 @@ msgstr ""
 "guibutton> одночасно, щоб перезавантажити комп’ютер."
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "Немає графічного інтерфейсу"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2609,13 +2620,16 @@ msgstr ""
 "впишіть <code>vgalo</code> у рядок запиту."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "Якщо комп’ютер є дуже застарілим, встановлення у графічному режимі може бути "
 "просто неможливим. У такому випадку варто скористатися встановленням у "
@@ -2625,12 +2639,12 @@ msgstr ""
 "Enter. Встановлення буде продовжено у текстовому режимі."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "Встановлення зупиняється"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2646,14 +2660,15 @@ msgstr ""
 "потреби, цю команду можна поєднати з вищевказаними командами."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "Проблеми з оперативною пам’яттю"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2666,18 +2681,20 @@ msgstr ""
 "МБ оперативної пам’яті."
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "Динамічні розділи"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "Якщо вами було перетворено ваш жорсткий диск з формату «basic» до формату "
 "«dynamic» у Microsoft Windows, вам слід знати, що вам не вдасться встановити "
@@ -2696,18 +2713,18 @@ msgstr "Поновлення"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2716,10 +2733,11 @@ msgstr ""
 "могло бути оновлено та поліпшено."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "Натисніть кнопку <guilabel>так</guilabel>, якщо ви хочете отримати і "
@@ -2727,8 +2745,9 @@ msgstr ""
 "хочете робити цього зараз або ваш комп’ютер не з’єднано з інтернетом."
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr ""
 "Щойно вибір буде зроблено, натисніть кнопку <guibutton>Далі</guibutton>, щоб "
 "продовжити роботу з програмою."
@@ -2788,18 +2807,18 @@ msgstr "Вибір носія (з пакунками, які не є вільн�
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2812,7 +2831,7 @@ msgstr ""
 "наступних кроках."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
@@ -2821,7 +2840,7 @@ msgstr ""
 "містяться основні пакунки дистрибутива."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2836,13 +2855,14 @@ msgstr ""
 "nVidia і ATI, мікропрограми для різноманітних карток WiFi тощо."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "У сховищі <emphasis>Tainted</emphasis> зберігаються пакунки, випущені "
 "відповідно до вільних ліцензійних угод. Основним критерієм для включення "
@@ -2853,38 +2873,41 @@ msgstr ""
 "для відтворення комерційних відео-DVD тощо."
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "Мінімальне встановлення"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "Ви можете вибрати «Мінімальне встановлення» зняттям позначок з усіх пунктів "
 "у списку вибору груп пакунків, див. розділ <xref linkend="
 "\"choosePackageGroups\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr ""
 "Якщо потрібно, ви можете додатково позначити пункт «Індивідуальний вибір "
 "пакунків» на тій самій сторінці."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "Мінімальний режим призначено для тих, хто має намір використовувати "
 "<application>Mageia</application> з якоюсь вузькоспеціалізованою метою, "
@@ -2894,9 +2917,10 @@ msgstr ""
 "пакунків, див. <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "Якщо ви виберете цей варіант встановлення, на наступній сторінці програми "
@@ -2904,16 +2928,14 @@ msgstr ""
 "документацію та графічний сервер."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
 msgstr ""
-"Якщо вибрано, у категорії «Разом з X» буде також пункт з IceWM, невибагливим "
-"стільничним середовищем."
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2927,15 +2949,15 @@ msgstr ""
 "href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link>."
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2952,11 +2974,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX намагається правильно визначити налаштування вашої системи відповідно "
 "до зробленого вами вибору та виявленого DrakX обладнання. Ви можете "
@@ -2965,9 +2988,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr ""
 "Як правило, рекомендованим є використання типових параметрів. Ви можете "
 "нічого не змінювати, окрім трьох винятків:"
@@ -2984,76 +3008,80 @@ msgstr "ви спробували типові параметри, і нічог
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr ""
 "у розділах із докладною інформацією, наведених нижче, стверджується, що слід "
 "вибрати нетипові параметри."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "Параметри системи"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Часовий пояс</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX вибирає часовий пояс на основі вказаної вами бажаної мови. Якщо "
 "потрібно, ви можете змінити часовий пояс. Див. також <xref linkend="
 "\"configureTimezoneUTC\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Країна / Регіон</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "Якщо ви перебуваєте не у тій країні, яку було вибрано автоматично, дуже "
 "важливо виправити значення цього параметра. Див. <xref linkend="
 "\"selectCountry\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Завантажувач</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX автоматично вибирає належні параметри завантажувача."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "Не вносьте ніяких змін, якщо ви не є знавцем з налаштовування Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 "Щоб дізнатися більше, зверніться до розділу <xref linkend=\"setupBootloader"
 "\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Керування записами користувачів</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -3062,22 +3090,23 @@ msgstr ""
 "кожного користувача буде власний каталог <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Служби</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "Системними службами називаються ті невеличкі програми, які працюють у "
 "фоновому режимі (фонові служби). За допомогою цього інструмента ви зможете "
 "увімкнути або вимкнути деякі з цих служб."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -3086,34 +3115,35 @@ msgstr ""
 "роботи комп’ютера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Щоб дізнатися більше, зверніться до розділу <xref linkend=\"configureServices"
 "\"/>."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "Параметри обладнання"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Клавіатура</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr ""
 "За допомогою цього розділу ви можете налаштувати або змінити розкладку "
 "клавіатури, параметри якої залежатимуть від місця вашого розташування, мови "
 "та типу клавіатури."
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -3122,12 +3152,12 @@ msgstr ""
 "її, не забудьте, що зі зміною розкладки може змінитися і текст вашого пароля."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Миша</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3136,42 +3166,43 @@ msgstr ""
 "пристрої, планшети, кульові маніпулятори тощо."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Звукова плата</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "Засобом встановлення буде використано типовий драйвер, якщо такий типовий "
 "драйвер передбачено. Можливість вибору іншого драйвера буде надано, лише "
 "якщо для картки передбачено декілька драйверів, але жоден з них не є типовим."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Графічний інтерфейс</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr ""
 "За допомогою цього розділу сторінки ви можете налаштувати параметри роботи "
 "ваших графічних карток та дисплеїв."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 "Щоб дізнатися більше, зверніться до розділу <xref linkend="
 "\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -3180,20 +3211,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "Параметри мережі та роботи у інтернеті"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Мережа</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -3203,21 +3235,22 @@ msgstr ""
 "application>, після вмикання сховищ закритих (Nonfree) пакунків."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr ""
 "Під час додавання мережевої карти не забудьте разом з нею налаштувати "
 "брандмауер (мережевий екран), який стежитиме за відповідним інтерфейсом."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Проксі</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -3228,26 +3261,27 @@ msgstr ""
 "служб проксі-сервера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr ""
 "Вам варто порадитися з вашим системним адміністратором, щоб дізнатися більше "
 "про значення параметрів, які слід вказати у цьому розділі."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "Безпека"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Рівень безпеки</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3257,19 +3291,19 @@ msgstr ""
 "комп’ютеру достатній захист."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr ""
 "Виберіть той з варіантів, який найкраще відповідає вашому способу "
 "використання системи."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Захисний шлюз</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
@@ -3279,7 +3313,7 @@ msgstr ""
 "цими даними."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3290,7 +3324,7 @@ msgstr ""
 "система. Докладніше про це у розділі <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 "Пам’ятайте, що вмикання доступу без обмежень (вимикання брандмауера) може "
@@ -3362,42 +3396,73 @@ msgstr ""
 "application>."
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">Додатково</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
 msgstr ""
-"За допомогою цієї сторінки ви можете змінити рівень захисту вашої системи."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:31
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
+msgid ""
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
 msgstr ""
-"Якщо ви не певні щодо потрібних вам параметрів, краще не змінюйте типових "
-"параметрів."
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "Після встановлення ви завжди зможете змінити параметри захисту за допомогою "
 "модуля <guilabel>Безпека</guilabel> Центру керування Mageia."
@@ -3414,9 +3479,10 @@ msgstr "Вступ"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr ""
 "Розповсюдження Mageia відбувається за допомогою образів ISO. За допомогою "
 "цієї сторінки довідки ви зможете вибрати образ, який відповідає вашим "
@@ -3424,16 +3490,17 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "Існує два сімейства носіїв дистрибутива:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "Класичний засіб встановлення: після завантаження з носія системи буде "
 "розпочато процедуру, протягом якої ви зможете вибрати компоненти для "
@@ -3442,85 +3509,88 @@ msgstr ""
 "вибрати стільничне середовище, яким би ви хотіли користуватися."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Портативні носії (LIVE): систему на такому носії можна завантажити як "
-"звичайну систему Mageia без встановлення для ознайомлення із тим, як усе "
-"виглядатиме після встановлення. Процес встановлення є простішим, але вибір "
-"варіантів є вужчим."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "Подробиці наведено у наступних розділах."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "Носій"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "Визначення"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "Тут ми називаємо носієм даних файл образу ISO, за допомогою якого можна "
 "встановити і/або оновити Mageia, а також будь-який фізичний носій, де "
 "зберігаються дані файла ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "Знайти носії даних можна <link ns4:href=\"http://www.mageia.org/uk/downloads/"
 "\">тут</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "Класичний носій для встановлення"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "Типові можливості"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr ""
 "На цих образах ISO використовується традиційний засіб встановлення під "
 "назвою drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr ""
 "Вони придатні для встановлення «з нуля» або оновлення попередніх випусків."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "Різні носії для 32-бітової та 64-бітової архітектур."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3529,14 +3599,14 @@ msgstr ""
 "відновлення, тест пам’яті, інструмент виявлення обладнання."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 "На кожному з DVD міститься багато стільничних середовищ та переклади різними "
 "мовами."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
@@ -3544,102 +3614,107 @@ msgstr ""
 "програмного забезпечення."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Портативний носій"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "Можна скористатися для ознайомлення із дистрибутивом без встановлення його "
 "на жорсткий диск. Втім, якщо хочеться, за допомогою цього носія можна "
 "встановити Mageia на вашому комп’ютері."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr ""
 "Кожен ISO містить лише одне стільничне середовище (Плазму, GNOME або Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Образами ISO портативних систем можна скористатися "
 "лише для встановлення системи «з нуля». Вони непридатні для оновлення "
 "системи з попередніх випусків.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "Містять невільне програмне забезпечення."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Портативний DVD з Плазмою"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "Лише стільничне середовище Плазми."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "Містить переклади усіма мовами."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "Лише для 64-бітової архітектури."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Портативний DVD із GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "Лише стільничне середовище GNOME."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "Лише для 64-бітової архітектури"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Портативний DVD з Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "Лише стільничне середовище Xfce."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "32-бітова і 64-бітова архітектури."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "Носії CD лише для завантаження"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3651,11 +3726,12 @@ msgstr ""
 "локальній мережі або у інтернеті."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "Такі носії є дуже малими (менше за 100 МБ). Ними зручно користуватися, якщо "
 "канал зв’язку у мережі є надто вузьким для отримання повноцінного образу "
@@ -3663,17 +3739,18 @@ msgstr ""
 "можуть завантажувати систему із флеш-диска USB."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "Лише англійська мова."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3707,11 +3784,12 @@ msgstr "Отримання"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "Щойно вами буде вибрано потрібний вам файл ISO, ви можете отримати його або "
 "за допомогою протоколу http, або за допомогою BitTorrent. У обох випадках у "
@@ -3726,10 +3804,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum і sha1sum — програми для перевірки цілісності даних у образах ISO. "
 "Для виконання перевірки достатньо встановити лише одну з цих програм. Для "
@@ -3743,8 +3822,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "Позначте пункт «Зберегти файл»."
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3752,14 +3831,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "Перевірка цілісності отриманих даних образу"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "Обидва шістнадцяткових числа обчислено за допомогою певного алгоритму на "
 "основі файла, який має бути отримано. Якщо ви попросите відповідну програму "
@@ -3770,70 +3850,85 @@ msgstr ""
 "його за допомогою BitTorrent."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr ""
 "Відкрийте консоль (від імені звичайного користувача) і віддайте таку команду:"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- Якщо використовується md5sum: [sam@localhost]$ <userinput>md5sum шлях/до/"
 "файла/образу.iso</userinput>."
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- Якщо використовується sha1sum: [sam@localhost]$ <userinput>sha1sum шлях/до/"
 "образу.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"і порівняйте отримане числове значення (для його отримання знадобиться "
-"певний час) з числом, вказаним на сторінці Mageia. Приклад:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"і порівняйте отримане числове значення (для його отримання знадобиться "
+"певний час) з числом, вказаним на сторінці Mageia. Приклад:"
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "Запис образу ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "Перевірений образ ISO можна записати на компакт-диск, DVD або флешку USB. "
 "Дія із запису не є простим копіюванням, — її призначено для створення "
 "придатного до завантаження системи носія даних."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Запис образу ISO на компакт-диск або DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "Скористайтеся будь-яким пристроєм для записування, але його має бути "
 "налаштовано на <emphasis role=\"bold\">запис образу</emphasis>. Просто "
@@ -3842,12 +3937,12 @@ msgstr ""
 "Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "Запис образу ISO на флешку USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3856,18 +3951,19 @@ msgstr ""
 "USB і користуватися нею для завантаження або встановлення системи."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "У результаті «запису» образу на диск USB (флешку) усі дані файлової системи "
 "на ній буде знищено. Доступ до усіх даних, які не буде знищено, буде "
 "втрачено. Розмір диска буде зменшено на розмір образу."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3876,12 +3972,12 @@ msgstr ""
 "повторно створити на ньому розділи і виконати форматування."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "Використання інструмента із графічним інтерфейсом у Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3891,73 +3987,72 @@ msgstr ""
 "IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "Використання інструмента із графічним інтерфейсом у Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "Ви можете спробувати такі засоби:"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> за "
 "допомогою пункту «ISO image» («образ ISO»);"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "За допомогою інструментів командного рядка у системі GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "Цей шлях є потенційно небезпечним. Ви можете пошкодити розділ на диску, якщо "
 "вкажете помилковий ідентифікатор пристрою."
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "Ви також можете скористатися консольною програмою dd:"
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "Відкрийте вікно консолі"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "Отримайте права користувача root за допомогою команди <userinput>su -</"
 "userinput> (не забудьте «-» наприкінці команди)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3967,29 +4062,41 @@ msgstr ""
 "яка може отримати доступ до даних або читати дані)."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Віддайте команду <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"Назву пристрою можна визначити за розміром. Наприклад, на наведеному вище "
+"знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка USB."
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "Крім того, визначити назву пристрою можна за допомогою команди <code>dmesg</"
 "code>: наприкінці виведених нею даних буде вказано назву пристрою, що "
 "починатиметься з <emphasis>sd</emphasis> з наступним фрагментом "
 "<emphasis>sdd</emphasis> у нашому випадку:"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -4031,46 +4138,55 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"Назву пристрою можна визначити за розміром. Наприклад, на наведеному вище "
-"знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка USB."
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "Віддайте таку команду: # <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:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "де X — назва потрібного вам пристрою. Приклад: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "Приклад: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Віддайте таку команду: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "Витягніть флешку USB. Запис завершено."
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -4101,19 +4217,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "Якщо вашої країни немає у списку, натисніть кнопку <guilabel>Інші країни</"
 "guilabel> і виберіть країну або регіон за допомогою вікна, яке буде відкрито."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "Якщо пункт вашої країни є лише у списку <guilabel>Інші країни</guilabel> "
@@ -4121,18 +4239,19 @@ msgstr ""
 "це, DrakX вже врахував ваш правильний вибір."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "Спосіб введення"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "За допомогою вікна <guilabel>Інші країни</guilabel> ви також можете вибрати "
@@ -4145,11 +4264,13 @@ msgstr ""
 "вибором пакунків було додано сховища пакунків HTTP/FTP."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "Якщо спосіб введення потрібен вам після встановлення системи, ви можете "
 "отримати доступ до нього після завантаження встановленої системи за "
@@ -4157,56 +4278,57 @@ msgstr ""
 "запуску localedrake від імені користувача root."
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "Встановлення або оновлення"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "Встановити"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
 msgstr ""
-"Цим варіантом слід скористатися, якщо ви хочете встановити "
-"<application>Mageia</application> з нуля."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "Поновити"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
+#, fuzzy
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"Якщо на вашому комп’ютері встановлено одну або декілька операційних систем "
-"<application>Mageia</application>, програма для встановлення надасть вам "
-"змогу оновити одну зі встановлених систем до найсвіжішої версії."
+"Виберіть жорсткий диск, який слід форматувати для встановлення "
+"<application>Mageia</application>."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "Командою із забезпечення якості дистрибутива виконано належне тестування "
 "лише оновлення з попередньої версії Mageia, підтримку якої ще <emphasis>не "
@@ -4215,16 +4337,17 @@ msgstr ""
 "початку, зберігши при цьому вміст розділу <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "Якщо протягом процедури встановлення ви вирішите припинити встановлення, ви "
 "можете перезавантажити комп’ютер. Втім, вам слід ретельно обдумати ваші дії. "
@@ -4237,12 +4360,14 @@ msgstr ""
 "guilabel> одночасно, щоб перезавантажити комп’ютер."
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "Якщо ви виявите, що забули встановити пакунки додаткової мови, ви можете "
 "повернутися зі сторінки «Встановлення або оновлення» до сторінки вибору мови "
@@ -4277,12 +4402,12 @@ msgstr ""
 "часовим поясом."
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "Клавіатура"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -4292,16 +4417,17 @@ msgstr ""
 "використано типову американську розкладку."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -4320,23 +4446,25 @@ msgstr ""
 "Розкладка_клавіатури</link>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "Якщо пункту вашої клавіатури не буде у показаному списку, натисніть кнопку "
 "<guibutton>Ще</guibutton> для ознайомлення з повним списком, з якого ви "
 "можете вибрати модель клавіатури."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "Після вибору моделі клавіатури за допомогою діалогового вікна <guibutton>Ще</"
 "guibutton> ви повернетеся до першого діалогового вікна вибору клавіатури, у "
@@ -4345,23 +4473,24 @@ msgstr ""
 "списку."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "Якщо вами було вибрано розкладку з нелатинськими символами, програма покаже "
 "додаткове діалогове вікно, за допомогою якого ви зможете визначитися зі "
 "способом перемикання між латинською і нелатинською розкладками."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "Вибір мови"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4373,7 +4502,7 @@ msgstr ""
 "встановленій системі."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
 "this selection during the installation and for your installed system."
@@ -4383,19 +4512,20 @@ msgstr ""
 "встановленій системі."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "Якщо у вашій системі буде використовуватися декілька мов (вами або іншими "
 "користувачами), натисніть кнопку <guibutton>Декілька мов</guibutton> , щоб "
 "додати їх. Після встановлення додати підтримку мов буде доволі складно."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4408,18 +4538,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "Навіть якщо вами було вибрано декілька мов, вам слід слід спочатку вибрати "
 "одну з них як основну мову сторінок програми для встановлення. Крім того, цю "
 "мову буде позначено і у вікні вибору декількох мов."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4429,23 +4560,24 @@ msgstr ""
 "мови, пов’язаної з вибраною розкладкою."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Типово, у Mageia використовується кодування UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "Це кодування можна вимкнути за допомогою вікна вибору декількох мов, якщо "
 "вам наперед відомо, що Unicode є несумісним з вашою мовою. Вимикання UTF-8 "
 "стосуватиметься всіх встановлених мов."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4500,70 +4632,75 @@ msgstr ""
 "більше кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Додавання пункту меню завантаження та внесення змін у такі пункти"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "Для цього вам доведеться внести вручну зміни до /boot/grub2/custom.cfg або "
 "скористатися програмою для налаштовування GRUB (наприклад grub-customizer зі "
 "сховищ Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: <link "
 "ns2:href=\"https://wiki.mageia.org/en/Grub2-efi_and_Mageia\">https://wiki."
 "mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "Інтерфейс завантажувача"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "Типово, Mageia ексклюзивно використовує:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 "Grub2 (з графічним меню або без нього) для застарілих систем із MBR або GPT"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "Grub2-efi для системи UEFI."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Графічні меню Mageia виглядають чудово. :)"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "Grub2 для застарілих систем із MBR та GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4576,30 +4713,35 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr ""
 "Не змінюйте значення параметри «Пристрій завантаження», якщо у цьому немає "
 "нагальної потреби."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "Grub2-efi у системах UEFI"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
 "відрізнятиметься, оскільки ви не зможете вибирати між завантажувачем із "
 "графічним меню і без нього."
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4612,14 +4754,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "Якщо Mageia є єдиною операційною системою, яку встановлено на вашому "
@@ -4632,36 +4775,41 @@ msgstr ""
 "кількості встановлених вами операційних систем."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "Користування завантажувачем Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "Типово, залежно від вашої системи, Mageia записує новий:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr ""
 "завантажувач GRUB2 або до MBR (Master Boot Record) вашого першого диска, або "
 "до завантажувального розділу BIOS."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "завантажувач Grub2-efi до ESP;"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "Якщо на комп’ютері вже встановлено інші операційні системи, Mageia спробує "
 "додати ці системи до вашого нового меню завантаження Mageia. Якщо вам це не "
@@ -4669,7 +4817,7 @@ msgstr ""
 "позначку з пункту <guilabel>Зондування сторонньої ОС</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setupBootloader3.png\"/> </imageobject> <imageobject condition=\"live"
@@ -4682,18 +4830,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "Користування вже встановленим завантажувачем"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "Повний перелік кроків додавання пункту операційної системи Mageia до меню "
 "вже встановленого завантажувача не є предметом цієї довідкової сторінки. "
@@ -4703,16 +4852,17 @@ msgstr ""
 "до іншої операційної системи."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "Використання ланцюгового завантаження"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "Якщо ви не хочете використовувати завантажувач Mageia, а замість цього "
 "хочете скористатися ланцюговим завантаженням з іншої операційної системи, "
@@ -4721,7 +4871,7 @@ msgstr ""
 "або MBR</guilabel>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4734,7 +4884,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4743,7 +4893,7 @@ msgstr ""
 "Проігноруйте попередження і натисніть кнопку <guibutton>Гаразд</guibutton>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
 "imageobject>"
@@ -4752,33 +4902,34 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "Параметри"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "Перша сторінка"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>Пауза перед завантаженням основної системи</guilabel>: за "
 "допомогою цього пункту ви можете встановити затримку у секундах перед "
 "завантаженням типової операційної системи."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
+#, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>Безпека</guilabel>: за допомогою цього розділу ви можете "
 "встановити пароль для доступу до завантажувача. Використання пароля "
@@ -4787,38 +4938,38 @@ msgstr ""
 "буде вибрати на наступному етапі."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr ""
 "<guilabel>Пароль</guilabel>: за допомогою цього поля для введення тексту ви "
 "можете вказати пароль."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля користувача "
 "у цьому полі. drakx перевірить, чи збігається введений вами повторно пароль "
 "з його початковим варіантом."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>Додатково</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "<guilabel>Увімкнути ACPI:</guilabel> ACPI (Advanced Configuration and Power "
 "Interface) є стандартом керування живленням комп’ютера. За його допомогою "
@@ -4830,9 +4981,10 @@ msgstr ""
 "або «замерзання» системи)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>Увімкнути SMP</guilabel>: за допомогою цього пункту можна "
@@ -4840,12 +4992,12 @@ msgstr ""
 "комп’ютері встановлено багатоядерний процесор."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>Увімкнути APIC</guilabel>: позначення цього пункту надає "
 "операційній системі доступ до розширеного програмованого контролера "
@@ -4854,29 +5006,30 @@ msgstr ""
 "керування розширеними IRQ (запитами щодо переривань)."
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>Увімкнути локальний APIC</guilabel>: за допомогою цього пункту ви "
 "можете увімкнути локальний APIC, тобто керування усіма зовнішніми "
 "перериваннями для певних процесорів у багатопроцесорних системах."
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "Наступна сторінка"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 "<guilabel>Типовий:</guilabel> типовий варіант операційної системи для "
 "завантаження."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4886,7 +5039,7 @@ msgstr ""
 "вам більше інформації під час завантаження системи."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4895,11 +5048,12 @@ msgstr ""
 "linkend=\"setupMageiaBootloader\">використання завантажувача Mageia</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>Режим відео:</guilabel> за допомогою цього пункту ви можете "
 "вказати розмірності екрана (у пікселях) та глибину кольорів для меню "
@@ -4908,7 +5062,7 @@ msgstr ""
 "якими можна скористатися."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4918,7 +5072,7 @@ msgstr ""
 "завантаження</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "Налаштування SCSI"
 
@@ -4931,36 +5085,39 @@ msgstr "Налаштування SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "Зазвичай DrakX визначає параметри дисків правильно. Втім, якщо ви маєте "
 "справу із застарілим дисковим контролером SCSI, можливі помилки, через які "
 "програма не зможе встановити потрібних драйверів."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr ""
 "Якщо вам трапився саме такий контролер, вам доведеться вручну повідомити "
 "DrakX, з яким диском SCSI доведеться мати справу."
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 "Після цього, DrakX зможе налаштувати систему на роботу з дисками належним "
@@ -4983,10 +5140,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "На цій сторінці буде показано назву драйвера, який інструмент встановлення "
 "вибрав для вашої звукової картки. Цим драйвером буде типовий драйвер, якщо "
@@ -5009,10 +5166,12 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "Після цього у вікні draksound або інструмента «Налаштування звуку» натисніть "
 "пункт <guibutton>Додатково</guibutton>, а потім кнопку <guibutton>Вирішення "
@@ -5020,16 +5179,18 @@ msgstr ""
 "вирішення проблеми."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "Додатково"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "Кнопкою <guibutton>Додатково</guibutton> під час встановлення варто "
 "користуватися, якщо для картки не передбачено типового драйвера або якщо "
@@ -5037,16 +5198,17 @@ msgstr ""
 "помилковий драйвер."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "У цьому випадку, ви можете вибрати інший драйвер після натискання кнопки "
 "<guibutton>Дозвольте мені підібрати драйвер</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "Підтвердження форматування жорсткого диска"
 
@@ -5057,13 +5219,13 @@ msgstr "Підтвердження форматування жорсткого �
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -5073,18 +5235,21 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr ""
 "Натисніть кнопку <guibutton>Назад</guibutton>, якщо ви не певні щодо "
 "зробленого вибору."
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "Натисніть кнопку <guibutton>Далі</guibutton>, якщо ви певні і хочете витерти "
 "всі розділи, всі операційні системи на диску і всі дані, що зберігаються на "
@@ -5214,16 +5379,12 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "Вилучення Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "Настанови"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "Якщо Mageia не задовольняє ваших потреб або ви не змогли належним чином "
@@ -5231,28 +5392,30 @@ msgstr ""
 "Це ваше право і у Mageia передбачено можливість вилучення системи. Таку "
 "можливість можна знайти не у кожній операційній системі."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "Після створення резервної копії даних, перезавантажте систему з DVD Mageia і "
 "виберіть пункт «Rescue system», далі «Restore Windows boot loader». Під час "
 "наступного завантаження системи завантажиться Windows без усіляких вікон "
 "вибору операційної системи."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "Щоб скористатися місцем на диску, яке колись було зайнято розділами Mageia, "
 "у Windows, скористайтеся пунктом меню <code>Пуск -> Панель керування -> "
@@ -5263,8 +5426,8 @@ msgstr ""
 "диску. Клацніть правою кнопкою миші на такому розділі і виберіть пункт "
 "<guibutton>Вилучити</guibutton>. Після цього місце на диску буде звільнено."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -5273,14 +5436,15 @@ msgstr ""
 "виконати його форматування (у FAT32 або NTFS). Система надасть йому "
 "відповідну літеру диска."
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "Якщо на комп’ютері встановлено Vista або 7, у вас буде ще один можливий "
 "варіант: ви можете розширити наявний розділ за допомогою пункту, "
@@ -5338,6 +5502,366 @@ msgstr ""
 "бачитимете порожній екран. Це нормально."
 
 #~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>Пароль (ще раз)</guilabel>: повторіть введення пароля "
+#~ "користувача у цьому полі. drakx перевірить, чи збігається введений вами "
+#~ "повторно пароль з його початковим варіантом."
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr ""
+#~ "Крім того, за допомогою цього діалогового вікна можна вимкнути або "
+#~ "увімкнути гостьовий обліковий запис."
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "Будь-які дані, які буде записано з гостьового облікового запису "
+#~ "<emphasis>rbash</emphasis> до відповідного каталогу у /home, буде витерто "
+#~ "під час виходу з системи. Користувачеві гостьового облікового запису слід "
+#~ "потурбуватися про збереження важливих файлів на портативний носій даних."
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>Увімкнути гостьовий запис</guilabel>: за допомогою цього пункту "
+#~ "можна увімкнути або вимкнути гостьовий обліковий запис. Користувач "
+#~ "гостьового облікового запису зможете увійти до системи, користуватися "
+#~ "комп’ютером, але матиме обмежені права доступу навіть порівняно зі "
+#~ "звичайними користувачами."
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>Код групи</guilabel>: тут ви можете встановити код "
+#~ "(ідентифікатор) групи користувача, обліковий запис якого було додано за "
+#~ "допомогою попереднього вікна. Слід вказати номер, зазвичай той самий, що "
+#~ "і для облікового запису користувача. Не заповнюйте це поле, якщо вам "
+#~ "невідомі наслідки ваших дій."
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "Для пункту «Пристрій» буде показано таке: «твердий диск», [«номер "
+#~ "твердого диска»(літера)], «номер розділу» (наприклад, «sda5»)."
+
+#~ msgid "Workstation."
+#~ msgstr "Робоча станція."
+
+#~ msgid "Server."
+#~ msgstr "Сервер"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "Графічне середовище."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr ""
+#~ "Передбачено чотири групи служб. Щоб розгорнути список кожної з груп, "
+#~ "натисніть кнопку з зображенням трикутника перед пунктом групи."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "Якщо вашої картки немає у списку карток за виробниками (оскільки вона ще "
+#~ "не встигла потрапити до бази даних або є надто старою), ви можете знайти "
+#~ "відповідний драйвер у категорії «Xorg»."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "Для кожного виявлено жорсткого диска або іншого носія даних (зокрема "
+#~ "картки флеш USB) буде відведено власну вкладку. Приклад: sda, sdb та sdc, "
+#~ "якщо буде виявлено три диски."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+#~ "doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+#~ "condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/></imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr ""
+#~ "Засіб встановлення розподілити наявне місце відповідно до таких правил:"
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "«Вирівняти до» «МіБ»"
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "«Вільне місце перед (МіБ)» «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>"
+
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "За допомогою цієї сторінки можна вказати деякі особисті уподобання:"
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу "
+#~ "мову) можна вибрати після натискання клавіші F2 (лише у застарілому "
+#~ "режимі)."
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "Нижче наведено приклад вікна вітання, перекладеного французькою, у "
+#~ "портативній версії системи на DVD або компакти диску. Зауважте, що у меню "
+#~ "портативної системи немає таких пунктів: <guilabel>Порятунок системи</"
+#~ "guilabel>, <guilabel>Тест пам’яті</guilabel> та <guilabel>Інструмент "
+#~ "пошуку обладнання</guilabel>."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "Додати параметри роботи ядра можна натисканням клавіші <emphasis role="
+#~ "\"bold\">F6</emphasis> у режимі застарілої системи або клавіші <emphasis "
+#~ "role=\"bold\">E</emphasis> у режимі UEFI."
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "Якщо програмі для встановлення не вдається виконати своє призначення "
+#~ "належним чином, ви можете повторити спробу, скориставшись додатковими "
+#~ "варіантами. У меню, яке можна викликати натисканням клавіші F6, буде "
+#~ "показано новий пункт, <guilabel>Boot options</guilabel> "
+#~ "(<guilabel>Параметри завантаження</guilabel>) з такими чотирма "
+#~ "підпунктами:"
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr ""
+#~ "Додаткові параметри роботи ядра можна вказати після натискання клавіші F1 "
+#~ "(лише у застарілому режимі)."
+
+#~ msgid "Using a Wired Network"
+#~ msgstr "За допомогою дротової мережі"
+
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "Нижче наведено типове вікно вітання образу для встановлення з дротової "
+#~ "мережі (образ netinstall.iso або netinstall-nonfree.iso):"
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "Мову тут змінити не можна. Список доступних параметрів наведено на "
+#~ "екрані. Докладніший опис використання образу для встановлення з мережі "
+#~ "наведено у <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
+#~ "\">вікі Mageia</link>."
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "Розкладка клавіатури відповідає американській англійській."
+
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr ""
+#~ "Якщо вибрано, у категорії «Разом з X» буде також пункт з IceWM, "
+#~ "невибагливим стільничним середовищем."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr ""
+#~ "За допомогою цієї сторінки ви можете змінити рівень захисту вашої системи."
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr ""
+#~ "Якщо ви не певні щодо потрібних вам параметрів, краще не змінюйте типових "
+#~ "параметрів."
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Портативні носії (LIVE): систему на такому носії можна завантажити як "
+#~ "звичайну систему Mageia без встановлення для ознайомлення із тим, як усе "
+#~ "виглядатиме після встановлення. Процес встановлення є простішим, але "
+#~ "вибір варіантів є вужчим."
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "Носії CD лише для завантаження"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "Позначте пункт «Зберегти файл»."
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "Ви також можете скористатися консольною програмою dd:"
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "Витягніть флешку USB. Запис завершено."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr ""
+#~ "Цим варіантом слід скористатися, якщо ви хочете встановити "
+#~ "<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."
+#~ msgstr ""
+#~ "Якщо на вашому комп’ютері встановлено одну або декілька операційних "
+#~ "систем <application>Mageia</application>, програма для встановлення "
+#~ "надасть вам змогу оновити одну зі встановлених систем до найсвіжішої "
+#~ "версії."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "Настанови"
+
+#~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 #~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
 #~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
@@ -5351,9 +5875,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "Спеціальний"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -5364,20 +5885,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr ""
-#~ "- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
-#~ "швидкодією."
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
@@ -5614,21 +6121,6 @@ msgstr ""
 #~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
 #~ "</imageobject>"
 
-#~ msgid ""
-#~ "<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>"
-#~ 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>"
-
 #~ msgid "With a Bios system"
 #~ msgstr "Із системою BIOS"
 
@@ -5936,13 +6428,6 @@ msgstr ""
 #~ "application>."
 
 #~ msgid ""
-#~ "Select the hard disk that should be formatted to install "
-#~ "<application>Mageia</application>."
-#~ msgstr ""
-#~ "Виберіть жорсткий диск, який слід форматувати для встановлення "
-#~ "<application>Mageia</application>."
-
-#~ msgid ""
 #~ "Be sure to select the correct hard disk. All data on the selected disk "
 #~ "will be lost. This step can not be undone."
 #~ msgstr ""
diff --git a/docs/docs/stable/installer/zh_CN.po b/docs/docs/stable/installer/zh_CN.po
index 1b04f846..5a05c5af 100644
--- a/docs/docs/stable/installer/zh_CN.po
+++ b/docs/docs/stable/installer/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-25 19:47+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-05-21 06:29+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -33,12 +33,13 @@ msgstr "许可证和发行说明"
 
 #. type: Content of: <section><mediaobject>
 #: en/acceptLicense.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"acceptLicense-im1\" fileref=\"dx2-license.png\" align=\"center\" revision="
+"\"4\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" fileref="
+"\"live-license.png\" xml:id=\"acceptLicense-im2\" revision=\"5\" align="
+"\"center\" condition=\"live\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
 "im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
@@ -71,8 +72,9 @@ msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
+#, fuzzy
 msgid ""
-"To accept, simply select <guilabel>Accept</guilabel> and then click on "
+"To proceed, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
 msgstr ""
 "要接受, 只要选择 <guilabel>接受</guilabel> 后点击 <guibutton>下一步</"
@@ -94,22 +96,23 @@ msgstr "发行说明"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
+#, fuzzy
 msgid ""
-"Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release Notes</"
+"Important information about this release of <application>Mageia</"
+"application> can be viewed by clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "有关此 Mageia 发布版本的重要信息，可以通过点击 <guibutton>发行说明</"
 "guibutton> 来阅读。"
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
-#: en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1
+#: en/add_supplemental_media.xml:1 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
+#: en/DrakX-cover.xml:1 en/DrakX.xml:1 en/media_selection.xml:1
 msgid "en"
 msgstr "zh_CN"
 
 #. type: Content of: <section><info><title>
-#: en/add_supplemental_media.xml:10
+#: en/add_supplemental_media.xml:3
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "介质选择 (设置增补的安装介质)"
 
@@ -117,59 +120,64 @@ msgstr "介质选择 (设置增补的安装介质)"
 #.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
 #.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
-#: en/add_supplemental_media.xml:18
+#: en/add_supplemental_media.xml:14
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
-"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
-"add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-add_supplemental_media."
+"png\" xml:id=\"dx2-add_supplemental_media-im1\" align=\"center\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
 "add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
 "add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:24
+#: en/add_supplemental_media.xml:19
+#, fuzzy
 msgid ""
-"This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The "
-"source selection determines which packages will be available for selection "
-"during the next steps."
+"This screen shows you the list of already recognized repositories. You can "
+"add other sources for packages, like an optical disc or a remote source.  "
+"The source selection determines which packages will be available during the "
+"next steps."
 msgstr ""
 "此窗口中列出了已识别的软件仓库。你可以添加其他的软件源，如光盘或远程资源。所"
 "选的源将决定下一步中哪些软件包可用于安装。"
 
 #. type: Content of: <section><para>
-#: en/add_supplemental_media.xml:29
+#: en/add_supplemental_media.xml:24
 msgid "For a network source, there are two steps to follow:"
 msgstr "如果需要获取网络资源，请执行以下两步："
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:33
+#: en/add_supplemental_media.xml:28
 msgid "Choosing and activation of the network, if not already up."
 msgstr "若尚未启用网络链接，请选择并启用它。"
 
 #. type: Content of: <section><orderedlist><listitem><para>
-#: en/add_supplemental_media.xml:37
+#: en/add_supplemental_media.xml:32
+#, fuzzy
 msgid ""
 "Selecting a mirror or specifying a URL (very first entry). By selecting a "
 "mirror, you have access to the selection of all repositories managed by "
-"Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
-"the URL, you can designate a specific repository or your own NFS "
-"installation."
+"Mageia, like the <emphasis role=\"bold\">Nonfree</emphasis>, the <emphasis "
+"role=\"bold\">Tainted</emphasis> repositories and the <emphasis role=\"bold"
+"\">Updates</emphasis>. With the URL, you can designate a specific repository "
+"or your own NFS installation."
 msgstr ""
 "选择一个镜像，或指定 URL（第一个选项）。若选择了镜像，则您需要能够访问所选择"
 "的所有仓库（由 Mageia 管理，例如 Nonfree、Tainted 和 Updates）。若指定了 "
 "URL，则可以使用特定的仓库或您的个人 NFS。"
 
 #. type: Content of: <section><note><para>
-#: en/add_supplemental_media.xml:46
+#: en/add_supplemental_media.xml:42
+#, fuzzy
 msgid ""
 "If you are updating a 64 bit installation which may contain some 32 bit "
 "packages, it is advised to use this screen to add an online mirror by "
-"ticking one of the Network protocols here. The 64 bit DVD iso only contains "
-"64 bit and noarch packages, it will not be able to update the 32 bit "
-"packages. However, after adding an online mirror, installer will find the "
-"needed 32 bit packages there."
+"ticking one of the Network protocols here. The 64-bit DVD ISO only contains "
+"64-bit and noarch packages, it will not be able to update the 32-bit "
+"packages. However, after adding an online mirror, the installer will find "
+"the needed 32-bit packages there."
 msgstr ""
 "若您整从包含 32 位软件包的版本升级到 64 位，我们建议您使用此窗口添加在线镜像"
 "（勾选一个网络协议）。64 位 DVD iso 仅包含 64 位软件包和非特定架构的软件包。"
@@ -182,7 +190,7 @@ msgstr "用户和管理员管理"
 
 #.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:7
+#: en/addUser.xml:9
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
 "\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
@@ -195,21 +203,21 @@ msgstr ""
 "\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:16
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "设置管理员（root 账户）密码："
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:19
+#: en/addUser.xml:24
+#, fuzzy
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
-"set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the "
-"top box the colour of its shield will change from red to yellow to green "
+"set a <emphasis role=\"bold\">superuser</emphasis> (administrator) password, "
+"usually called the <emphasis>root password</emphasis> in Linux. As you type "
+"a password into the top box a shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
-"just below the first password box, this checks that you have not mistyped "
-"the first password by comparing them."
+"underneath, to check that the first entry was not mistyped."
 msgstr ""
 "我们建议任何时候安装 <application>Mageia</application> 都设置一个超级用户或管"
 "理员密码（Linux 中一般叫做 root 密码）。当你在顶部输入框中输入密码时，盾的颜"
@@ -217,85 +225,92 @@ msgstr ""
 "较高。你需要在下方输入框中再次输入相同的密码，以确保你之前的密码没有输错。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:28
+#: en/addUser.xml:34
+#, fuzzy
 msgid ""
-"All passwords are case sensitive, it is best to use a mixture of letters "
+"All passwords are case sensitive. It is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 "所有的密码都区分大小写。建议在密码中混合使用字母（大写和小写）、数字和其他字"
 "符。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:35
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "输入用户名"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:37
+#: en/addUser.xml:45
+#, fuzzy
 msgid ""
-"Add a user here. A user has fewer rights than the superuser (root), but "
-"enough to use the internet, office applications or play games and anything "
-"else the average user does with his computer"
+"Add a user here. A regular user has fewer privileges than the <emphasis role="
+"\"bold\">superuser</emphasis> (root), but enough to use the internet, office "
+"applications or play games and anything else the average user might use "
+"their computer for."
 msgstr ""
 "在这里添加一个用户。一个用户拥有比超级管理员更少的权限，但是网上冲浪，使用办"
 "公软件或者玩游戏等是足够的。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:40
+#: en/addUser.xml:52
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "user's icon."
 msgstr "<guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:43
+#: en/addUser.xml:57
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the user's real name into this text "
 "box."
 msgstr "<guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:46
+#: en/addUser.xml:62
+#, fuzzy
 msgid ""
-"<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the user's real name. <emphasis>The login name is "
+"<guilabel>Login Name</guilabel>: Enter the user login name or let DrakX use "
+"a version of the user's real name. <emphasis role=\"bold\">The login name is "
 "case sensitive.</emphasis>"
 msgstr ""
 "<guilabel>登录名</guilabel>：输入用户的登录名，或让 drakx 根据真实姓名自动设"
 "置。<emphasis>登录名区分大小写。</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:50
+#: en/addUser.xml:67
+#, fuzzy
 msgid ""
-"<guilabel>Password</guilabel>: In this text box you should type in the user "
-"password. There is a shield at the end of the text box that indicates the "
-"strength of the password. (See also <xref linkend=\"givePassword\"/>)"
+"<guilabel>Password</guilabel>: Type in the user password. There is a shield "
+"at the end of the text box that indicates the strength of the password. (See "
+"also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>密码</guilabel>：在此文本框中输入用户密码。后面的盾牌图标将会指示密"
 "码强度。（参见 <xref linkend=\"givePassword\"/>）"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:55
+#: en/addUser.xml:73
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user "
-"password text boxes."
+"<guilabel>Password (again)</guilabel>: Retype the user password DrakX will "
+"check that you have not mistyped the password."
 msgstr ""
-"<guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次输入"
-"的密码是否一致。"
+"<guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是"
+"否一致。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:61
+#: en/addUser.xml:79
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a both read and write "
-"protected home directory (umask=0027)."
+"Any users you added while installing Mageia, will have a home directory that "
+"is both read and write protected (umask=0027)."
 msgstr ""
 "在安装 Mageia 期间添加的任何用户都将拥有读/写保护的主目录（即 umask=0027）。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:63
+#: en/addUser.xml:82
+#, fuzzy
 msgid ""
-"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"You can add any extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
@@ -303,81 +318,57 @@ msgstr ""
 "<emphasis>用户管理</emphasis>即可。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:66
+#: en/addUser.xml:86
 msgid "The access permissions can also be changed after the install."
 msgstr "也可以在安装完成后改变访问权限。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:72
+#: en/addUser.xml:93
 msgid "Advanced User Management"
 msgstr "高级用户管理"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:74
+#: en/addUser.xml:96
+#, fuzzy
 msgid ""
-"If the <guibutton>advanced</guibutton> button is clicked you are offered a "
-"screen that allows you to edit the settings for the user you are adding."
+"The <guibutton>Advanced</guibutton> option allows you to edit further "
+"settings for the user you are adding."
 msgstr ""
 "若点击<guibutton>高级</guibutton>按钮，您可以在弹出的窗口中对所添加的用户进行"
 "设置。"
 
-#. type: Content of: <section><section><para>
-#: en/addUser.xml:77
-msgid "Additionally, you can disable or enable a guest account."
-msgstr "此外，您还可以禁用或启用来宾账户。"
-
-#. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:80
-msgid ""
-"Anything a guest with a default <emphasis>rbash</emphasis> guest account "
-"saves to his /home directory will be erased when he logs out.  The guest "
-"should save his important files to a USB key."
-msgstr ""
-"任何使用<emphasis>rbash</emphasis>来宾账户创建的文件将会在注销后被删除。来宾"
-"应当将他/她的临时文件存储于 U 盘等设备中。"
-
-#. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
-msgid ""
-"<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
-"guest account. The guest account allows a guest to log into and use the PC, "
-"but he has more restricted access than normal users."
-msgstr ""
-"<guilabel>启用来宾账户</guilabel>：这里您可以启用或禁用来宾账户。来宾账户允许"
-"来宾登录并使用电脑，但对其使用更严格的访问权限控制。"
-
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: en/addUser.xml:101
+#, fuzzy
 msgid ""
-"<guilabel>Shell</guilabel>: This drop down list allows you to change the "
-"shell used by the user you are adding in the previous screen, options are "
-"Bash, Dash and Sh"
+"<guilabel>Shell</guilabel>: This drop-down list allows you to change the "
+"shell available to any user you added in the previous screen. Options are "
+"<emphasis role=\"bold\">Bash</emphasis>, <emphasis role=\"bold\">Dash</"
+"emphasis> and <emphasis role=\"bold\">Sh</emphasis>"
 msgstr ""
 "<guilabel>Shell</guilabel>：可以在下列列表中选择用户所使用的 shell（在上一步"
 "中添加），可能的选项有 Bash、Dash 和 Sh。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:97
+#: en/addUser.xml:107
+#, fuzzy
 msgid ""
-"<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
-"are adding in the previous screen. This is a number.  Leave it blank unless "
-"you know what you are doing."
+"<guilabel>User ID</guilabel>: Here you can set the <emphasis role=\"bold"
+"\">user ID</emphasis> for any user you added in the previous screen. If you "
+"are unsure what the purpose of this is, then leave it blank."
 msgstr ""
 "<guilabel>用户 ID</guilabel>：这里您可以设置之前所添加的用户的 ID（数值）。若"
 "您不确定如何设置，请将其留空。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:113
 msgid ""
-"<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know "
-"what you are doing."
+"<guilabel>Group ID</guilabel>: This lets you set the <emphasis role=\"bold"
+"\">group ID</emphasis>. Again, if unsure, leave it blank."
 msgstr ""
-"<guilabel>组 ID</guilabel>：这里您可以设置之前所添加的用户的 组 ID（数值，一"
-"般与用户 ID 相同）。若您不确定如何设置，请将其留空。"
 
 #. type: Content of: <section><info><title>
-#: en/ask_mntpoint_s.xml:11
+#: en/ask_mntpoint_s.xml:3
 msgid "Choose the mount points"
 msgstr "选择挂载点"
 
@@ -394,13 +385,14 @@ msgstr "选择挂载点"
 #.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\" align=\"center\" fileref=\"dx2-chooseMountpoints."
+"png\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" fileref=\"live-chooseMountpoints.png\" align="
+"\"center\" xml:id=\"live-chooseMountPoints-im1\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -410,7 +402,7 @@ msgstr ""
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:37
+#: en/ask_mntpoint_s.xml:36
 msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
@@ -420,38 +412,42 @@ msgstr ""
 "议不合适，你可以手动更改挂载点。"
 
 #. type: Content of: <section><note><para>
-#: en/ask_mntpoint_s.xml:42
+#: en/ask_mntpoint_s.xml:41
+#, fuzzy
 msgid ""
-"If you change anything, make sure you still have a <literal>/</literal> "
-"(root) partition."
+"If you change anything, make sure you still have a <emphasis role=\"bold"
+"\"><literal>/</literal></emphasis> (root) partition."
 msgstr ""
 "如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:48
+#: en/ask_mntpoint_s.xml:46
+#, fuzzy
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
-"\", \"Type\")."
+"Every partition is shown to the left as: <emphasis role=\"bold\">Device "
+"(capacity, mount point, type).</emphasis>"
 msgstr "所有分区的属性将按下列顺序显示：“设备名”（“容量”，“挂载点”，“类型”）。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:53
+#: en/ask_mntpoint_s.xml:50
 msgid ""
-"\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
-"\"partition number\" (for example, \"sda5\")."
+"<emphasis role=\"bold\">Device</emphasis>, is made up of: <emphasis role="
+"\"bold\">hard drive</emphasis>, [<emphasis role=\"bold\">hard drive name</"
+"emphasis> (letter)], <emphasis role=\"bold\">partition number</emphasis> "
+"(for example, <emphasis role=\"bold\">sda5</emphasis>)."
 msgstr ""
-"“设备名”包括：“硬盘驱动器”，[“硬盘驱动器编号”（由字母表示）]，“分区编号”。例"
-"如，“sda5”表示第一个 SCSI 设备上的第五个分区。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:59
+#: en/ask_mntpoint_s.xml:56
+#, fuzzy
 msgid ""
-"If you have many partitions, you can choose many different mount points from "
-"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
-"and <literal>/var</literal>. You can even make your own mount points, for "
-"instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
-"literal> partition of a cauldron install."
+"If you have several partitions, you can choose various different mount "
+"points from the drop down menu, such as <emphasis role=\"bold\">/</"
+"emphasis>, <emphasis role=\"bold\"><literal>/home</literal></emphasis> and "
+"<emphasis role=\"bold\">/var</emphasis>. You can even make your own mount "
+"points, for instance <emphasis role=\"bold\"><literal>/video</literal></"
+"emphasis> for a partition where you want to store your films, or <emphasis "
+"role=\"bold\">/Data</emphasis> (or some other name) for your data."
 msgstr ""
 "如果存在多个分区，你可以从下列列表中选择不同的挂载点来使用，例如 <literal>/</"
 "literal>、<literal>/home</literal> 和 <literal>/var</literal>。也可以自定义挂"
@@ -459,25 +455,27 @@ msgstr ""
 "home</literal> 用于 cauldron 系统的用户主目录。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/ask_mntpoint_s.xml:69
+#: en/ask_mntpoint_s.xml:63
+#, fuzzy
 msgid ""
-"For partitions you don't need to have access to, you can leave the mount "
-"point field blank."
+"For any partitions that you don't need to make use of, you can leave the "
+"mount point field blank."
 msgstr "对于非必需的分区，挂载点一项可以留空。"
 
 #. type: Content of: <section><warning><para>
-#: en/ask_mntpoint_s.xml:75
+#: en/ask_mntpoint_s.xml:69
+#, fuzzy
 msgid ""
-"Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
-"and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
-"that follows, you can click on a partition to see its type and size."
+"If you are not sure what to choose, click <emphasis role=\"bold\">Previous</"
+"emphasis> to go back and then tick <guilabel>Custom disk partitioning</"
+"guilabel>, where, you can click on a partition to see its type and size."
 msgstr ""
 "如果不确定如何选择，请点击 <guibutton>上一步</guibutton> 按钮，然后点击 "
 "<guilabel>自定义磁盘分区</guilabel>，在出现的窗口中点击分区来查看其类型和大"
 "小。"
 
 #. type: Content of: <section><para>
-#: en/ask_mntpoint_s.xml:81
+#: en/ask_mntpoint_s.xml:74
 msgid ""
 "If you are sure the mount points are correct, click on <guibutton>Next</"
 "guibutton>, and choose whether you only want to format the partition(s) "
@@ -718,15 +716,17 @@ msgstr "桌面环境选择"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:8
+#, fuzzy
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine "
+"Depending on your selection here, you may be offered further screens to fine-"
 "tune your choice."
 msgstr "根据所选项不同，随后会出现不同的窗口用于详细设置。"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
+#, fuzzy
 msgid ""
-"After the selection step(s), you will see a slide show during package "
+"After the selection step(s), you will see a slide-show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
 msgstr ""
@@ -744,14 +744,16 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:21
+#, fuzzy
 msgid ""
-"Choose whether you prefer to use the <application>KDE</application> or "
-"<application>Gnome</application> desktop environment. Both come with a full "
-"set of useful applications and tools. Tick <guilabel>Custom</guilabel> if "
-"you want to use neither or both, or if you want something other than the "
-"default software choices for these desktop environments. The "
-"<application>LXDE</application> desktop is lighter than the previous two, "
-"sporting less eye candy and fewer packages installed by default."
+"Choose whether you prefer to use the <application>KDE</application> "
+"<emphasis role=\"bold\">Plasma </emphasis>or <application>GNOME</"
+"application> desktop environment. Both come with a full set of useful "
+"applications and tools. Tick <guilabel>Custom</guilabel> if you wish to use "
+"neither (or even use both), or if you want to modify the default software "
+"choices for these desktop environments. The <application>LXDE</application> "
+"desktop, for instance, is lighter than the previous two, sporting less eye "
+"candy and fewer packages installed by default."
 msgstr ""
 "请选择 <application>KDE</application> 或 <application>GNOME</application> 作"
 "为桌面环境。这两种环境均包含有用的应用程序盒工具。若希望全部安装或均不安装，"
@@ -776,8 +778,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:14
+#, fuzzy
 msgid ""
-"Packages have been sorted into groups, to make choosing what you need on "
+"Packages are arranged into common groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
@@ -787,58 +790,65 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:21
-msgid "Workstation."
-msgstr "工作区"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Workstation</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:25
-msgid "Server."
-msgstr "服务器。"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Server</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:29
-msgid "Graphical Environment."
-msgstr "图形界面环境"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Graphical Environment</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:33
+#, fuzzy
 msgid ""
-"Individual Package Selection: You can use this option to manually add or "
-"remove packages."
+"I<emphasis role=\"bold\">Individual Package Selection</emphasis>: you can "
+"use this option to manually add or remove packages"
 msgstr "单独选择软件包：您可以使用此选项来手动添加/移除软件包。"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"See <xref linkend=\"minimal-install\"/> for instructions on how to do a "
 "minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "请阅读 <xref linkend=\"minimal-install\"/> 来了解如何进行最小化安装（包活或不"
 "包括 X 服务和 IceWM 桌面环境）。"
 
 #. type: Content of: <section><info><title>
-#: en/choosePackagesTree.xml:4
+#: en/choosePackagesTree.xml:3
 msgid "Choose Individual Packages"
 msgstr "选择单个软件包"
 
 #. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
-#: en/choosePackagesTree.xml:11
+#: en/choosePackagesTree.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackagesTree.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:17
+#: en/choosePackagesTree.xml:14
+#, fuzzy
 msgid ""
-"Here you can add or remove any extra packages to customise your installation."
+"Here you can add or remove any extra packages to customize your installation."
 msgstr "您可以在此处添加或移除额外的软件包，或自定义安装。"
 
 #. type: Content of: <section><para>
-#: en/choosePackagesTree.xml:20
+#: en/choosePackagesTree.xml:17
 msgid ""
 "After having made your choice, you can click on the <guibutton>floppy icon</"
 "guibutton> at the bottom of the page to save your choice of packages (saving "
@@ -851,50 +861,50 @@ msgstr ""
 "同的安装部署（只需在安装时再次点击此按钮并加载配置文件即可）。"
 
 #. type: Content of: <section><info><title>
-#: en/configureServices.xml:12
+#: en/configureServices.xml:3
 msgid "Configure your Services"
 msgstr "配置服务"
 
 #.  2012-12-25 marja - moved this section out of misc-params.xml 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/configureServices.xml:21
+#: en/configureServices.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-configureServices.png"
+"\" xml:id=\"configureServices-im1\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:27
+#: en/configureServices.xml:16
+#, fuzzy
 msgid ""
-"Here you can set which services should (not) start when you boot your system."
+"Here you can choose which services should start when you boot your system."
 msgstr "您可以在此处设置系统启动时需要启用的服务。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:30
-msgid ""
-"There are four groups, click on the triangle before a group to expand it and "
-"see all services in it."
-msgstr "单击各组前的三角形图标可以展开该组中的服务。"
+#: 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:34
-msgid "The setting DrakX chose are usually good."
+#: en/configureServices.xml:22
+#, fuzzy
+msgid "The settings DrakX chose are usually good."
 msgstr "DrakX自动选择的设置通常可正常工作。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:37
+#: en/configureServices.xml:25
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
 msgstr "若高亮选中服务，则可在下方的信息框中查看此服务的细节。"
 
 #. type: Content of: <section><para>
-#: en/configureServices.xml:41
+#: en/configureServices.xml:28
 msgid "Only change things when you know very well what you are doing."
 msgstr "只有在您完全了解您的行为的风险后再作出改动。"
 
@@ -907,12 +917,13 @@ msgstr "配置时区"
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id="
-"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
-"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"configureTimezoneUTC-im1\" align=\"center\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" revision=\"1\"/> </imageobject> <imageobject> "
+"<imagedata format=\"PNG\" fileref=\"live-timeZone.png\" condition=\"live\"/> "
+"</imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -922,16 +933,18 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
+#, fuzzy
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the "
-"same time zone."
+"Choose your time-zone by choosing your country or a city close to you in the "
+"same time-zone."
 msgstr "选择国家/地区或城市来确定您的时区。"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
+#, fuzzy
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to "
-"GMT, also known as UTC."
+"In the next screen you can choose to set your hardware clock to local time "
+"or to GMT, also known as UTC."
 msgstr "在下一个窗口中，您可以将硬件时钟设置为本地时间或  GMT（也即 UTC）。"
 
 #. type: Content of: <section><note><para>
@@ -943,126 +956,124 @@ msgstr ""
 "若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_card_list.xml:11
+#: en/configureX_card_list.xml:13
 msgid "Choose an X Server (Configure your Graphic Card)"
 msgstr "选择一个X服务器(配置您的显示卡)"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_card_list.xml:16
+#: en/configureX_card_list.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<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>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:21
+#: en/configureX_card_list.xml:23
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:24
+#: en/configureX_card_list.xml:26
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
 msgstr "若安装程序无法正确检测您的显卡，请在以下列表中选择一个合适的配置："
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
+#: en/configureX_card_list.xml:29 en/configureX_monitor.xml:57
 msgid "vendor"
 msgstr "制造商"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:31
+#: en/configureX_card_list.xml:33
 msgid "then the name of your card"
 msgstr "显卡名"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_card_list.xml:35
+#: en/configureX_card_list.xml:37
 msgid "and the type of card"
 msgstr "卡的类型"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:39
+#: en/configureX_card_list.xml:41
+#, fuzzy
 msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
-"Xorg category"
-msgstr ""
-"若您找不到所需的制造商列表（如显卡太老，或尚未加入到数据库中），您也可以在 "
-"Xorg 目录中找到合适的驱动"
-
-#. type: Content of: <section><para>
-#: en/configureX_card_list.xml:43
-msgid ""
-"The Xorg listing provides more than 40 generic and open source video card "
-"drivers. If you still can't find a named driver for your card there is the "
-"option of using the vesa driver which provides basic capabilities."
+"<emphasis role=\"bold\">Xorg</emphasis> category, which provides more than "
+"40 generic and open source video card drivers. If you still can't find a "
+"specific driver for your card there is the option of using the <emphasis "
+"role=\"bold\">vesa</emphasis> driver which provides basic capabilities."
 msgstr ""
 "Xorg 目录提供了超过 40 种通用的开源显卡驱动。若您仍然无法找到合适的显卡驱动，"
 "请使用 vesa 驱动以确保基本的显示功能。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:48
+#: en/configureX_card_list.xml:47
+#, fuzzy
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
-"to the Commandline Interface."
+"to the <emphasis role=\"bold\">Command-line</emphasis> Interface."
 msgstr ""
 "请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
+#, fuzzy
 msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
-"may only be available in the Nonfree repository and in some cases only from "
-"the card manufacturers' websites."
+"may only be available in the <emphasis role=\"bold\">Nonfree</emphasis> "
+"repository and in some cases only from the card manufacturers' websites."
 msgstr ""
 "部分显卡制造商仅提供私有 Linux 驱动（在 Nonfree 仓库中），部分驱动仅能在制造"
 "商的官网上找到。"
 
 #. type: Content of: <section><para>
-#: en/configureX_card_list.xml:55
+#: en/configureX_card_list.xml:56
+#, fuzzy
 msgid ""
-"The Nonfree repository needs to be explicitly enabled to access them.  If "
-"you didn't select it previously, you should do this after your first reboot."
+"The <emphasis role=\"bold\">Nonfree</emphasis> repository needs to be "
+"explicitly enabled to access them. If you didn't enable it previously, you "
+"should do this after your first reboot."
 msgstr ""
 "需要手动启用 Nonfree 仓库才能使用其中的程序。若您在此之前未选中 Nonfree 仓"
 "库，您应当在安装完成并重启后启用它。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_chooser.xml:4
+#: en/configureX_chooser.xml:3
 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
 #. type: Content of: <section><mediaobject>
-#: en/configureX_chooser.xml:11
+#: en/configureX_chooser.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_chooser-im1\" "
+"fileref=\"dx2-configureX_chooser.png\" align=\"center\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_chooser.xml:18
+#: en/configureX_chooser.xml:15
+#, fuzzy
 msgid ""
 "No matter which graphical environment (also known as desktop environment) "
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
-"any other graphical environment to work well, the following <acronym>X</"
-"acronym> settings need to be correct. Choose the correct settings if you can "
-"see that <application>DrakX</application> didn't make a choice, or if you "
-"think the choice is incorrect."
+"<acronym>KDE</acronym> Plasma, <acronym>GNOME</acronym>, <acronym>LXDE</"
+"acronym> or any other graphical environment to work well, the following "
+"<acronym>X</acronym> settings need to be correct. Choose the correct "
+"settings if none are shown, or if you think the details are incorrect."
 msgstr ""
 "无论是哪一种图形环境（也叫桌面环境），都基于一个叫做 <acronym>X 窗口系统</"
 "acronym>（也叫 <acronym>X</acronym>）的服务。因此，必须正确设定以下的 "
@@ -1071,7 +1082,7 @@ msgstr ""
 "<application>DrakX</application> 没有提供默认选项，请手动指定正确参数。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:31
+#: en/configureX_chooser.xml:27
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
@@ -1080,13 +1091,14 @@ msgstr ""
 "备。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:37
+#: en/configureX_chooser.xml:33
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Monitor</guibutton></emphasis>: You can choose "
-"<guilabel>Plug'n Play</guilabel> when applicable, or choose your monitor "
-"from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
-"Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
-"horizontal and vertical refresh rates of your monitor."
+"<guilabel>Plug'n Play</guilabel> if applicable, or choose your monitor from "
+"the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. Choose "
+"<guilabel>Custom</guilabel> if you prefer to manually set the horizontal and "
+"vertical refresh rates of your monitor."
 msgstr ""
 "<emphasis><guibutton>显示器</guibutton></emphasis>：您可以选择 <guilabel>即插"
 "即用</guilabel> 显示器，或从 <guilabel>制造商</guilabel> 或 <guilabel>通用</"
@@ -1094,30 +1106,31 @@ msgstr ""
 "<guilabel>自定义</guilabel>。"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/configureX_chooser.xml:45
+#: en/configureX_chooser.xml:41
 msgid "Incorrect refresh rates may damage your monitor"
 msgstr "不正确的刷新率可能会损坏显示器"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:51
+#: en/configureX_chooser.xml:47
+#, fuzzy
 msgid ""
-"<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
-"resolution and color depth of your monitor here."
+"<emphasis><guibutton>Resolution</guibutton></emphasis>: The resolution and "
+"color depth of your monitor ca be set here."
 msgstr ""
 "<emphasis><guibutton>分辨率</guibutton></emphasis>：选择显示器的分辨率和色彩"
 "深度。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:56
+#: en/configureX_chooser.xml:52
+#, fuzzy
 msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
-"always appear during install. If the button is there, you can control your "
-"settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept. "
-"If you don't see anything, you'll return to the configuration screen and be "
-"able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't available</"
-"emphasis>"
+"always appear during install. If the option is there, and you test your "
+"settings, you should be ask whether your settings are correct. If you answer "
+"<emphasis role=\"bold\">yes</emphasis>, the settings will be kept. If you "
+"don't see anything, you'll return to the configuration screen and be able to "
+"reconfigure everything until the test result is satisfactory. If the test "
+"option is not available, then make sure your settings are on the safe side."
 msgstr ""
 "<emphasis><guibutton>测试</guibutton></emphasis>：测试按钮不一定总是出现在安"
 "装中。您可以按下此按钮来查看设置是否正确。若出现询问设置是否正确的对话框，您"
@@ -1126,7 +1139,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/configureX_chooser.xml:67
+#: en/configureX_chooser.xml:63
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
@@ -1135,46 +1148,47 @@ msgstr ""
 "选项。"
 
 #. type: Content of: <section><info><title>
-#: en/configureX_monitor.xml:18
+#: en/configureX_monitor.xml:11
 msgid "Choosing your Monitor"
 msgstr "选择您的显示器"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:21
+#: en/configureX_monitor.xml:14
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
 msgstr "DrakX 有齐全的显卡数据库，一般情况下可以正确识别您的视频设备。"
 
 #. type: Content of: <section><warning><para>
-#: en/configureX_monitor.xml:26
+#: en/configureX_monitor.xml:19
+#, fuzzy
 msgid ""
-"<emphasis>Selecting a monitor with different characteristics could damage "
-"your monitor or video hardware. Please don't try something without knowing "
-"what you are doing.</emphasis> If in doubt you should consult your monitor "
-"documentation"
+"<emphasis role=\"bold\">Selecting a monitor with different characteristics "
+"could damage your monitor or video hardware. Please don't try something "
+"without knowing what you are doing.</emphasis> If in doubt you should "
+"consult your monitor documentation."
 msgstr ""
 "<emphasis>选择错误的属性可能会损坏显示器或视频设备。若不确定，请不要轻易尝试"
 "未知模式。</emphasis>若仍有疑问，请查询显示器文档。"
 
 #. type: Content of: <section><mediaobject>
-#: en/configureX_monitor.xml:34
+#: en/configureX_monitor.xml:26
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"configureX_monitor-im1\" "
+"fileref=\"dx2-configureX_monitor.png\" align=\"center\" revision=\"1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
-"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:42
+#: en/configureX_monitor.xml:31
 msgid "<emphasis>Custom</emphasis>"
 msgstr "<emphasis>自定义</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:44
+#: en/configureX_monitor.xml:33
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
 "rate and the horizontal sync rate. Vertical refresh determines how often the "
@@ -1185,7 +1199,7 @@ msgstr ""
 "的周期，水平同步率决定扫描行的显示速率。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:49
+#: en/configureX_monitor.xml:38
 msgid ""
 "It is <emphasis>VERY IMPORTANT</emphasis> that you do not specify a monitor "
 "type with a sync range that is beyond the capabilities of your monitor: you "
@@ -1196,64 +1210,66 @@ msgstr ""
 "示器。若仍有疑问，请查询显示器文档。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:55
+#: en/configureX_monitor.xml:44
 msgid "<emphasis>Plug 'n Play</emphasis>"
 msgstr "<emphasis>即插即用</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:58
+#: en/configureX_monitor.xml:47
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
 msgstr "默认选项，根据显示器数据库确定显示器类别。"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:63
+#: en/configureX_monitor.xml:51
 msgid "<emphasis>Vendor</emphasis>"
 msgstr "<emphasis>供应商</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:65
+#: en/configureX_monitor.xml:53
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
 msgstr "若安装程序无法正确检测您的显示器，请在以下列表中选择一个合适的配置："
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:73
+#: en/configureX_monitor.xml:61
 msgid "the monitor manufacturers name"
 msgstr "显示器制造商名称"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/configureX_monitor.xml:77
+#: en/configureX_monitor.xml:65
 msgid "the monitor description"
 msgstr "显示器描述"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:82
+#: en/configureX_monitor.xml:69
 msgid "<emphasis>Generic</emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/configureX_monitor.xml:84
+#: en/configureX_monitor.xml:71
+#, fuzzy
 msgid ""
-"selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
-"often a good monitor selection group if you need to use the Vesa card driver "
-"when your video hardware cannot be determined automatically. Once again it "
-"may be wise to be conservative in your selections."
+"selecting this group will list nearly 30 display configurations such as "
+"1024x768 @ 60Hz and includes flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the <emphasis role="
+"\"bold\">Vesa</emphasis> card driver when your video hardware cannot be "
+"determined automatically. Once again it may be wise to be conservative in "
+"your selections."
 msgstr ""
 "此组可以支持近30种显示格式，如 1024x768 @ 60Hz 和笔记本上使用的平板显示器。当"
 "您因硬件无法被正确识别而必须使用 Vesa 显卡驱动器时，此选项将会提供最佳的兼容"
 "性。推荐保留此选项。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:6
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:10
+#: en/diskdrake.xml:12
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1264,94 +1280,98 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:18
+#: en/diskdrake.xml:22
+#, fuzzy
 msgid ""
-"If you wish to use encryption on your <literal>/</literal> partition you "
-"must ensure that you have a separate <literal>/boot</literal> partition. The "
-"encryption option for the <literal>/boot</literal> partition must NOT be "
-"set, otherwise your system will be unbootable."
+"If you wish to use encryption on your <emphasis role=\"bold\">/</emphasis> "
+"partition you must ensure that you have a separate <emphasis role=\"bold\">/"
+"boot</emphasis> partition. The encryption option for the <emphasis role="
+"\"bold\">/boot</emphasis> partition must NOT be set, otherwise your system "
+"will be unbootable."
 msgstr ""
 "若您希望将 <literal>/</literal> 分区加密，您必须确保 /boot 位于单独的分区中，"
 "并且该分区不能被加密；否则，系统将无法启动。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:24
+#: en/diskdrake.xml:29
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s)  here. You can remove or create "
+"Modify the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
-"view what is in them before you start."
+"view their details before you start."
 msgstr ""
 "在此处调整磁盘布局。您可以移除或创建分区、改变文件系统类型或改变分区大小，同"
 "时预览操作后的效果。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:28
+#: en/diskdrake.xml:34
 msgid ""
-"There is a tab for every detected hard disk or other storage device, like an "
-"USB key. For example sda, sdb and sdc if there are three of them."
+"There is a tab at the top for every detected hard disk (or other storage "
+"device like a USB key). In the screen-shot above there are two available "
+"devices: <emphasis role=\"bold\">sda </emphasis>and <emphasis role=\"bold"
+"\">sdb</emphasis>."
 msgstr ""
-"每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签页中"
-"分别显示 sda、sdb、sdc 的磁盘布局。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:31
+#: en/diskdrake.xml:39
+#, fuzzy
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
-"storage device"
+"Take care with the <guibutton>Clear all</guibutton> option, use it only if "
+"you are sure you want to wipe all partitions on the selected storage device."
 msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it. "
-"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
-"guibutton>) gives some more tools like to add a label or to choose a "
-"partition type."
+"<guibutton>Expert mode</guibutton> provides more options such as a label "
+"(give a name to) a partition, or to choose a partition type."
 msgstr ""
 "对于其他操作：请先点击要操作的分区；然后查看其详细信息，或选择文件系统和挂载"
 "点，改变其大小或擦除它。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
-msgid "Continue until you adjusted everything to your wishes."
+#: en/diskdrake.xml:49
+#, fuzzy
+msgid "Continue until you have adjusted everything to your satisfaction."
 msgstr "请继续，直到所需操作完成。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:40
+#: en/diskdrake.xml:52
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:43
+#: en/diskdrake.xml:56
+#, fuzzy
 msgid ""
-"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
-"System Partition) is present and correctly mounted on /boot/EFI (see below)"
+"If you are installing Mageia on a UEFI system, check that an ESP (EFI System "
+"Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "若您需要在 UEFI 硬件上使用 Mageia，请确保您设置了 ESP（EFI 系统分区），并且已"
 "被挂载至 /boot/EFI（见下）"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:61
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/></imageobject><imageobject condition=\"live"
-"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:46
+#: en/diskdrake.xml:60
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:72
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
@@ -1361,7 +1381,7 @@ msgstr ""
 "正确的分区标志"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:76
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1375,29 +1395,31 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:12
+#, fuzzy
 msgid ""
-"In this screen you can see the content of your hard drive(s) and see the "
-"solutions the DrakX partitioning wizard found for where to install "
-"<application>Mageia</application>."
+"In this screen you can see the content of your hard drive(s) along with the "
+"DrakX partitioning proposals for where to install <application>Mageia</"
+"application>."
 msgstr ""
 "在此处您可以查看硬盘驱动器中的内容，并选择 DrakX 分区向导所提供的 "
 "<application>Mageia</application> 的安装方法。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:13
+#: en/doPartitionDisks.xml:16
+#, fuzzy
 msgid ""
-"The options available from the list below will vary depending on your "
-"particular hard drive(s) layout and content."
+"The options available from those shown below will vary according to the "
+"layout and content of your particular hard drive(s)."
 msgstr "根据特定硬盘布局和内容的不同，下列选项可能会有所不同。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:21
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1410,12 +1432,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:24
+#: en/doPartitionDisks.xml:32
 msgid "Use Existing Partitions"
 msgstr "使用现存的分区"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:25
+#: en/doPartitionDisks.xml:35
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1424,31 +1446,31 @@ msgstr ""
 "安装。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:41
 msgid "Use Free Space"
 msgstr "使用空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:43
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr "若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:29
+#: en/doPartitionDisks.xml:49
 msgid "Use Free Space on a Windows Partition"
 msgstr "使用 Windows 分区中的空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:52
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr "若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:32
+#: en/doPartitionDisks.xml:56
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1458,7 +1480,7 @@ msgstr ""
 "所有重要文件！"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:35
+#: en/doPartitionDisks.xml:61
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1472,48 +1494,51 @@ msgstr ""
 "移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:41
+#: en/doPartitionDisks.xml:69
+#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
-"light blue and the future Mageia partition in dark blue with their intended "
-"sizes just under. You have the possibility to adapt these sizes by clicking "
-"and dragging the gap between both partitions. See the screen-shot below."
+"light blue and the proposed Mageia partition in dark blue with their "
+"intended sizes just underneath. You have the option to modify these sizes by "
+"clicking and dragging the gap between both partitions. See the following "
+"screen-shot."
 msgstr ""
 "安装程序将用亮蓝色标记其余的 Windows 分区，用深蓝色标记将用于安装 Mageia 的分"
 "区位置。您可以点击和拖动目标分区之间的空隙以便更改分区大小（参见下面的截"
 "图）。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:45
+#: en/doPartitionDisks.xml:76
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
-"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/></imageobject>"
-msgstr ""
 "<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:45
+#: en/doPartitionDisks.xml:87
 msgid "Erase and use Entire Disk."
 msgstr "擦除磁盘，并使用整个磁盘。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:46
-msgid "This option will use the complete drive for Mageia."
+#: en/doPartitionDisks.xml:90
+#, fuzzy
+msgid "This option will allocate the entire drive for Mageia."
 msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:93
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "注意！将会删除所选驱动器上的所有数据！请谨慎操作！"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:48
+#: en/doPartitionDisks.xml:96
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1523,97 +1548,111 @@ msgstr ""
 "要使用此选项。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:103
 #, fuzzy
 msgid "Custom disk partitioning"
 msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:52
+#: en/doPartitionDisks.xml:106
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr "允许您完全控制系统在硬盘上的安装方式。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:55
+#: en/doPartitionDisks.xml:112
 #, fuzzy
 msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:114
 msgid ""
-"The installer will share the available place out according to the following "
-"rules:"
-msgstr "安装程序将会根据下列规则使用可用空间："
+"If you are not using the <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option, the installer will allocate the available space according "
+"to the following rules:"
+msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:58
+#: en/doPartitionDisks.xml:120
+#, fuzzy
 msgid ""
-"If the total available place is lower than 50 GB, only one partition is "
-"created for /, there is no separate partition for /home."
+"If the total available space is less than 50 GB, then only one partition is "
+"created. This will be the <emphasis role=\"bold\">/</emphasis> (root) "
+"partition."
 msgstr "若可用空间小于 50GB，则只创建 / 分区，不创建单独的 /home 分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:60
+#: en/doPartitionDisks.xml:125
+#, fuzzy
 msgid ""
-"If the total available place is over 50 GB, then three partitions are created"
+"If the total available space is greater than 50 GB, then three partitions "
+"are created"
 msgstr "若总可用空间大于 50GB，则创建三个分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:61
+#: en/doPartitionDisks.xml:130
+#, fuzzy
 msgid ""
-"6/19 of the total available place is allocated to / with a maximum of 50 GB"
+"6/19 of the total available place is allocated to <emphasis role=\"bold\">/</"
+"emphasis> with a maximum of 50 GB"
 msgstr "其中 6/19 被分配给 / 分区，最大不超过 50GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:134
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 被分配给交换分区，最大不超过 4GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
-msgid "the rest (at least 12/19) is allocated to /home"
+#: en/doPartitionDisks.xml:138
+#, fuzzy
+msgid ""
+"the rest (at least 12/19) is allocated to <emphasis role=\"bold\">/home.</"
+"emphasis>"
 msgstr "剩余部分（至少 12/19）被分配给 /home 分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:63
+#: en/doPartitionDisks.xml:144
+#, fuzzy
 msgid ""
-"That means that from 160 GB and over of available place, the installer will "
-"create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
+"That means that from 160 GB or greater available space, the installer will "
+"create three partitions: 50 GB for <emphasis role=\"bold\">/</emphasis>, 4 "
+"GB for <emphasis role=\"bold\">swap</emphasis> and the remainder for "
+"<emphasis role=\"bold\">/home</emphasis>."
 msgstr ""
 "这意味着如果您有 160GB 可用空间，将会创建 50GB 的 / 分区，4GB 的交换分区，以"
 "及 106GB 的 /home 分区。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:67
+#: en/doPartitionDisks.xml:150
 #, fuzzy
 msgid ""
-"If you are using an UEFI system, the ESP (EFI System Partition) will be "
-"automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
-"allows to check it has been correctly done"
+"If you are using a UEFI system, the ESP (EFI System Partition) will be "
+"automatically detected - or created if it does not exist yet, and mounted "
+"on /boot/EFI. The <emphasis role=\"bold\">Custom disk partitioning</"
+"emphasis> option is the only one that allows to check it has been correctly "
+"done"
 msgstr ""
 "若您使用 UEFI 系统，将自动检测并创建 ESP（EFI 系统分区），之后将其挂载到 /"
 "boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:73
+#: en/doPartitionDisks.xml:158
 #, fuzzy
 msgid ""
-"If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
-"you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
-"\"/> to be able to create it with the Installer like any other partition, "
-"just select BIOS boot partition as filesystem type."
+"If you are using a Legacy (CSM or BIOS) system with a GPT disk, you need to "
+"create a BIOS boot partition if not already existing. It is a roughly 1 MiB "
+"partition with no mount point. Choose <xref linkend=\"diskdrake\"/> to be "
+"able to create it with the Installer like any other partition, just select "
+"BIOS boot partition as the filesystem type."
 msgstr ""
 "若您使用传统的硬件（即 CSM  或 BIOS），并且使用 GPT 格式的硬盘分区，您需要先"
 "创建一个 BIOS 引导分区。该分区一般为 1 MiB 左右，且不会被挂载。请选择“自定义"
 "磁盘分区”，然后手动创建一个 BIOS 引导分区。"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:79
+#: en/doPartitionDisks.xml:165
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -1626,7 +1665,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:175
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1635,34 +1674,38 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:93
+#: en/doPartitionDisks.xml:182
+#, fuzzy
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
-"previous standard of 512 byte logical sectors. Due to lack of available "
-"hardware, the partitioning tool used in the installer has not been tested "
-"with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning "
-"tool like gparted, if you own such a device, and to use the following "
-"settings:"
+"previous standard of 512. Due to lack of available hardware, the "
+"partitioning tool used in the installer has not been tested with such a "
+"drive. Also some SSD devices now use an erase block size over 1 MB. If you "
+"have such a device we suggest that you partition the drive in advance, using "
+"an alternative partitioning tool like <emphasis role=\"bold\">gparted</"
+"emphasis>, and to use the following settings:"
 msgstr ""
 "一些新式驱动器的逻辑扇区大小为 4096 字节，而非传统的 512 字节。此类硬件尚未被"
 "测试。此外，一些 SSD 驱动器的擦除块大小为 1MB。若您正在使用这类驱动器，我们建"
 "议您使用其他的分区工具（如gparted）预先进行分区操作："
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:100
-msgid "\"Align to\" \"MiB\""
-msgstr "“对齐到”“MiB”"
+#: en/doPartitionDisks.xml:189
+#, fuzzy
+msgid "<emphasis role=\"bold\">Align to</emphasis> = MiB"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:101
-msgid "\"Free space preceding (MiB)\" \"2\""
-msgstr "“前面的自由空间（MiB）”“2”"
+#: en/doPartitionDisks.xml:191
+#, fuzzy
+msgid "<emphasis role=\"bold\">Free space preceding (MiB)</emphasis> = 2"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:194
+#, fuzzy
 msgid ""
-"Also make sure all partitions are created with an even number of megabytes."
+"Also make sure all partitions are created using an even number of megabytes."
 msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
 
 #. type: Content of: <article><info><title>
@@ -1671,7 +1714,7 @@ msgid "Installation from LIVE medium"
 msgstr "从 LIVE 介质安装"
 
 #. type: Content of: <book><info>
-#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:5
+#: en/DrakLive-cover.xml:5 en/DrakX-cover.xml:4
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
@@ -1686,18 +1729,18 @@ msgid "Mageia 5"
 msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
-#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
+#: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:14
 msgid "The Official Documentation for Mageia"
 msgstr "Mageia 的官方文档"
 
 #. type: Content of: <book><info><cover><mediaobject>
-#: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
+#: en/DrakLive-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
+#: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:20
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
@@ -1709,7 +1752,7 @@ msgstr ""
 "licenses/by-sa/3.0/</link>）发布。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
+#: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:23
 #: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
@@ -1720,7 +1763,7 @@ msgstr ""
 "ns6:href=\"http://www.calenco.com\">Calenco CMS</link> 生成。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
+#: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:25
 #: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
@@ -1731,13 +1774,13 @@ msgstr ""
 "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:37
+#: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:36
 #: en/DrakX.xml:6
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
+#: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:37
 #: en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
@@ -1748,26 +1791,34 @@ msgstr ""
 "时的选项。"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
+#: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:40
 #: en/DrakX.xml:10
 msgid "</note>"
 msgstr "</note>"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:36 en/DrakX.xml:3
+#: en/DrakX-cover.xml:3 en/DrakX-cover.xml:35 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "用 DrakX 安装"
 
 #. type: Content of: <book><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10
+#: en/DrakX-cover.xml:9
 msgid "February 2014"
 msgstr "2014 年二月"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11
+#: en/DrakX-cover.xml:10
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
+#. type: Content of: <book><info><cover><mediaobject>
+#: en/DrakX-cover.xml:16
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/exitInstall.xml:3
 msgid "Congratulations"
@@ -1775,7 +1826,7 @@ msgstr "恭喜"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:7
+#: en/exitInstall.xml:9
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1784,7 +1835,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:11
+#: en/exitInstall.xml:14
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1792,28 +1843,29 @@ msgid ""
 msgstr "您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:18
+#, fuzzy
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
-"systems on your computer (if you have more than one)."
+"systems (if there are more than one) on your computer."
 msgstr ""
 "重启之后，在引导界面可以看到操作系统选项（若您的计算机上有两个以上操作系"
 "统）。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:17
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr "若您没有调整引导器的配置，将会自动启动 Mageia。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:20
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Enjoy!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1827,31 +1879,31 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/firewall.xml:6
 msgid ""
-"This section allows to configure some simple firewall rules: they determine "
-"which type of message from the Internet will be accepted by the target "
-"system. This, in turn, allows the corresponding services on the system to be "
-"accessible from the Internet."
+"This section allows you to configure some simple firewall rules: they "
+"determine which type of message from the Internet will be accepted by the "
+"target system. This, in turn, allows the corresponding services on the "
+"system to be accessible from the Internet."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:12
 msgid ""
-"In the default setting, no button is checked - no service of the system is "
-"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
-"emphasis>\" button has a particular role: it enables access to all services "
-"of the machine - an option that does not make much sense in the context of "
-"the installer since it would create a totally unprotected system.  Its "
-"veritable use is in the context of the Mageia Control Center (which uses the "
-"same GUI layout) for temporarily disabling the entire set of firewall rules "
-"for testing and debugging purposes."
+"In the default setting (no button is checked), no service of the system is "
+"accessible from the network. The <emphasis role=\"bold\">Everything (no "
+"firewall)</emphasis> enables access to all services of the machine - an "
+"option that does not make much sense in the context of the installer since "
+"it would create a totally unprotected system. Its veritable use is in the "
+"context of the Mageia Control Center (which uses the same GUI layout) for "
+"temporarily disabling the entire set of firewall rules for testing and "
+"debugging purposes."
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:21
 msgid ""
-"All other checkbuttons are more or less self-explanatory. As an example, you "
-"will check the \"CUPS server\" button if you want printers on your machine "
-"to be accessible from the network."
+"All other options are more or less self-explanatory. As an example, you will "
+"enable the <emphasis role=\"bold\">CUPS server</emphasis> if you want "
+"printers on your machine to be accessible from the network."
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -1863,21 +1915,19 @@ msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 #. type: Content of: <section><para>
 #: en/firewall.xml:27
 msgid ""
-"The set of checkbuttons only comprises the most common services. The "
-"\"Advanced\" button allows to enable messages that correspond to a service "
-"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
-"button opens a window where you can enable a series of services by typing a "
-"list of couples (blank separated)"
+"The <emphasis role=\"bold\">Advanced</emphasis> option opens a window where "
+"you can enable a series of services by typing a list of couples (blank "
+"separated)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:33
+#: en/firewall.xml:31
 #, fuzzy
 msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
 msgstr "<emphasis>通用</emphasis>"
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:36
+#: en/firewall.xml:34
 msgid ""
 "- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
 "the service you want to enable (e.g. 873 for the RSYNC service) as defined "
@@ -1885,28 +1935,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><simplelist><member>
-#: en/firewall.xml:40
+#: en/firewall.xml:38
 msgid ""
 "- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
 "<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:45
+#: en/firewall.xml:43
 msgid ""
 "For instance, the entry for enabling access to the RSYNC service therefore "
 "is <emphasis>873/tcp</emphasis>."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/firewall.xml:48
+#: en/firewall.xml:46
 msgid ""
 "In case a service is implemented to use both protocols, you specify 2 "
 "couples for the same port."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/formatPartitions.xml:4
+#: en/formatPartitions.xml:3
 msgid "Formatting"
 msgstr "格式化"
 
@@ -1915,14 +1965,14 @@ msgstr "格式化"
 #.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
-#: en/formatPartitions.xml:18
+#: en/formatPartitions.xml:15
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
-"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
-"</imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-formatPartitions.png\" xml:id=\"formatPartitions-im1\" align=\"center"
+"\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata format=\"PNG\" xml:id=\"live-formatPartitions-im1\" align=\"center"
+"\" fileref=\"live-formatPartitions.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1932,21 +1982,22 @@ msgstr ""
 "</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:30
+#: en/formatPartitions.xml:24
+#, fuzzy
 msgid ""
 "Here you can choose which partition(s) you wish to format. Any data on "
-"partitions <emphasis>not</emphasis> marked for formatting will be saved."
+"partitions <emphasis>not</emphasis> marked for formatting will be preserved."
 msgstr ""
 "这里您可以选择要格式化的分区。<emphasis>未标记为格式化</emphasis>的分区上的数"
 "据将会被保留。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:34
+#: en/formatPartitions.xml:28
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
 msgstr "一般情况下，DrakX 自动选择的分区需要被格式化。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:37
+#: en/formatPartitions.xml:31
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
@@ -1955,30 +2006,31 @@ msgstr ""
 "的分区。"
 
 #. type: Content of: <section><tip><para>
-#: en/formatPartitions.xml:42
+#: en/formatPartitions.xml:36
+#, fuzzy
 msgid ""
 "If you're not sure you have made the right choice, you can click on "
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
-"and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
-"In that screen you can choose to view what is in your partitions."
+"and then on <guibutton>Custom</guibutton> to get back to the main screen, "
+"where you can choose to view details of your partitions."
 msgstr ""
 "若您不确定所做选择是否正确，可以点击两次 <guibutton>上一页</guibutton>回到主"
 "界面，然后查看相应分区中的数据。"
 
 #. type: Content of: <section><para>
-#: en/formatPartitions.xml:49
+#: en/formatPartitions.xml:43
 msgid ""
 "When you are confident about the selection, click on <guibutton>Next</"
 "guibutton> to continue."
 msgstr "若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:3
+#: en/installer.xml:10
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX，Mageia 的安装器"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:7
+#: en/installer.xml:13
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1988,70 +2040,81 @@ msgstr ""
 "级系统。"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:11
+#: en/installer.xml:17
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr "初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:16
+#: en/installer.xml:22
 msgid "Installation Welcome Screen"
 msgstr "安装欢迎屏幕"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:19
+#: en/installer.xml:25
 #, fuzzy
 msgid "Using a Mageia DVD"
 msgstr "使用 Mageia 提供的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:21
+#: en/installer.xml:27
 #, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with an UEFI system and the second one with a Legacy system:"
+"is what you will see if you have a UEFI system, the second one is for a "
+"Legacy system:"
 msgstr ""
 "此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二个"
 "是使用 UEFI 引导的系统。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:26
+#: en/installer.xml:32
 #, 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:31
+#: en/installer.xml:37
 msgid ""
-"From this screen, you can access to options by pressing the \"e\" letter to "
-"enter the \"edit mode\". To come back to this screen, press either the key "
-"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
-"with saving."
+"From this screen, you have access to options by pressing \"<emphasis role="
+"\"bold\">e</emphasis>\" to enter the edit mode. To come back to this screen, "
+"press either <emphasis role=\"bold\">Esc</emphasis> key to quit without "
+"saving or press the key <emphasis role=\"bold\">Ctrl</emphasis> or <emphasis "
+"role=\"bold\">F10</emphasis> to quit with saving."
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:37
+#: en/installer.xml:45
 #, 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:42
-#, fuzzy
-msgid "From this screen, it is possible to set some personal preferences:"
-msgstr "在此页中，可以进行自定义设置："
+#: 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:45
+#: en/installer.xml:55
 msgid ""
-"The language (for the installation only, may be different that the chosen "
-"language for the system) by pressing the key F2 (Legacy mode only)"
+"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."
 msgstr ""
-"按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:50
+#: en/installer.xml:67
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
@@ -2060,37 +2123,23 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:55
-msgid "Use the arrow keys to select the language and press the key Enter."
+#: en/installer.xml:72
+#, fuzzy
+msgid ""
+"Use the arrow keys to select the language then press <emphasis role=\"bold"
+"\">Enter</emphasis>."
 msgstr "使用方向键来选择语言，然后按 Enter 键。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:58
-msgid ""
-"Here is for example, the French welcome screen when using a Live DVD/CD. "
-"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
-"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
-"Tool</guilabel>."
-msgstr ""
-"此处给出了使用 Live DVD/CD 安装时法语版的欢迎界面。注意，Live DVD/CD 菜单中不"
-"包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> and "
-"<guilabel>硬件检测工具</guilabel>。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:65
+#: en/installer.xml:77
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:72
-msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgid ""
+"If needed, change the screen resolution by pressing <emphasis role=\"bold"
+"\">F3</emphasis> (Legacy mode only)."
 msgstr "按 F3 键可以更改屏幕分辨率（仅用于传统模式）。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:76
+#: en/installer.xml:81
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
@@ -2099,48 +2148,49 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:83
-msgid ""
-"Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
-"emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
-"emphasis> key for the UEFI mode."
-msgstr ""
-"按 <emphasis role=\"bold\">F6</emphasis> 键（传统模式下）或 <emphasis role="
-"\"bold\">e</emphasis> 键（UEFI 模式下）可以添加内核参数。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:85
+#: en/installer.xml:88
 msgid ""
-"If the installation fails, then it may be necessary to try again using one "
-"of the extra options. The menu called by F6 displays a new line called "
-"<guilabel>Boot options</guilabel> and propose four entries:"
+"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 ""
-"若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项</"
-"guilabel>，这里提供了四个选项："
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:90 en/installer.xml:93
-msgid "- Default, it doesn't alter anything in the default options."
+#. 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 "- 默认，即使用默认选项。"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:96
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:101
+#, fuzzy
 msgid ""
-"- No ACPI (Advanced Configuration and Power Interface), power management "
-"isn't taken into account."
+"Safe Settings: Priority is given to the safer options at the price of a "
+"performance detriment."
+msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:106
+#, fuzzy
+msgid ""
+"No ACPI: (Advanced Configuration and Power Interface): Power management "
+"features are not used."
 msgstr "- 无 ACPI（高级配置与电源接口），不使用电源管理功能"
 
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:99
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/installer.xml:113
+#, fuzzy
 msgid ""
-"- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
-"about CPU interruptions, select this option if you are asked for."
+"No Local APIC: (Local Advanced Programmable Interrupt Controller): CPU "
+"interrupt. Select this option if you experience system misbehaviour like a "
+"kernel panic in relation to APIC."
 msgstr ""
 "- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择"
 "此选项"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:103
+#: en/installer.xml:120
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2149,17 +2199,18 @@ msgstr ""
 "项。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:108
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"In some Mageia releases, it may happen that the entries selected with the "
-"key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
-"however, they are really taken into account."
+"In some Mageia releases, it may happen that the entries selected with "
+"<emphasis role=\"bold\">F6</emphasis> do not appear in the <guilabel>Boot "
+"Options</guilabel> line, despite this, they will in fact be applied."
 msgstr ""
 "在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</"
 "guilabel>中出现，但这并不影响选项发挥作用。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:115
+#: en/installer.xml:132
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
@@ -2168,23 +2219,19 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:122
-msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr "按 F1 键可以添加更多内核参数（仅用于传统模式）。"
-
-#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:125
+#: en/installer.xml:139
 #, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options.  Select one with "
-"the arrow keys and press Enter to have more details or press the Esc key to "
-"go back to the welcome screen."
+"Pressing <emphasis role=\"bold\">F1</emphasis> opens a help window for "
+"various boot options. Select an item with the arrow keys and press <emphasis "
+"role=\"bold\">Enter</emphasis> for more details or press <emphasis role="
+"\"bold\">Esc</emphasis> to go back to the welcome screen."
 msgstr ""
 "按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或按 "
 "Esc 来返回到欢迎屏幕。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:131
+#: en/installer.xml:146
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
@@ -2193,18 +2240,19 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:136
+#: en/installer.xml:151
+#, fuzzy
 msgid ""
-"The detailed view about the option splash. Press Esc or select "
-"<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
-"These options can by added by hand in the <guilabel>Boot options</guilabel> "
-"line."
+"The detailed view about the splash option. Press <emphasis role=\"bold"
+"\">Esc</emphasis> or select <guilabel>Return to Boot Options</guilabel> to "
+"go back to the options list. These options can be added by hand in the "
+"<guilabel>Boot Options</guilabel> line."
 msgstr ""
 "有关 splash 选项的细节。按 Esc 或选择 <guilabel>返回引导选项</guilabel>可以回"
 "到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:142
+#: en/installer.xml:158
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
@@ -2213,12 +2261,15 @@ msgstr ""
 "</imageobject>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
-#: en/installer.xml:148
-msgid "The help is translated in the chosen language with the F2 key."
+#: en/installer.xml:164
+#, fuzzy
+msgid ""
+"The help is translated in the chosen language with <emphasis role=\"bold"
+"\">F2</emphasis>."
 msgstr "按 F2 键可以将帮助翻译为所选语言。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/installer.xml:152
+#: en/installer.xml:168
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2228,78 +2279,44 @@ msgstr ""
 "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><section><title>
-#: en/installer.xml:159
-msgid "Using a Wired Network"
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:161
-#, fuzzy
-msgid ""
-"Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
-msgstr ""
-"此处是使用有线网络安装 CD（Boot.iso 或 Boot-Nonfree.iso 镜像）安装时的默认欢"
-"迎界面："
-
-#. type: Content of: <section><section><section><para>
-#: en/installer.xml:165
-msgid ""
-"It does not allow to change the language, the available options are "
-"described in the screen. For more information about using a Wired Network-"
-"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
-"iso_install\">the Mageia Wiki</link>"
-msgstr ""
-"此处无法改变语言，界面中列出了可用的选项。有关使用有线网络安装 CD 来安装的更"
-"多细节，请参考 <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
-"\">Mageia Wiki</link>。"
-
-#. type: Content of: <section><section><section><warning><para>
-#: en/installer.xml:171
-msgid "The keyboard layout is the American one."
-msgstr "键盘布局为美式键盘。"
-
-#. type: Content of: <section><section><section><mediaobject>
-#: en/installer.xml:175
-#, fuzzy
-msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-
 #. type: Content of: <section><section><title>
-#: en/installer.xml:183
+#: en/installer.xml:177
 msgid "The installation steps"
 msgstr "安装步骤"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:185
+#: en/installer.xml:179
+#, fuzzy
 msgid ""
-"The install process is divided into a number of steps, which can be followed "
-"on the side panel of the screen."
+"The install process is divided into a number of steps, the status of which "
+"is indicated in a panel to the left of the screen."
 msgstr "安装过程被分为多个步骤，可以在侧边栏看到安装进度。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:188
+#: en/installer.xml:182
+#, fuzzy
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
-"guibutton> buttons with extra, less commonly required, options."
+"guibutton> sections with extra, less commonly required, options."
 msgstr ""
 "每一步包含一个或多个窗口，并且可使用<guibutton>高级</guibutton>按钮查看不常用"
 "的选项。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:192
+#: en/installer.xml:186
+#, fuzzy
 msgid ""
-"Most screens have <guibutton>Help</guibutton> buttons which give further "
-"explanations about the current step."
+"Most screens have <guibutton>Help</guibutton> buttons for further details "
+"about the particular step."
 msgstr ""
 "多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:196
+#: en/installer.xml:190
+#, fuzzy
 msgid ""
-"If somewhere during install you decide to stop the installation, it is "
-"possible to reboot, but please think twice before you do this.  Once a "
+"If at some points during the install you decide to stop the installation, it "
+"is possible to reboot, but please think twice before you do this. Once a "
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
@@ -2313,17 +2330,17 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
 
 #. type: Content of: <section><section><title>
-#: en/installer.xml:209
+#: en/installer.xml:203
 msgid "Installation Problems and Possible Solutions"
 msgstr "安装问题和问题解决方案"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:212
+#: en/installer.xml:206
 msgid "No Graphical Interface"
 msgstr "不使用图形界面"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:216
+#: en/installer.xml:210
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2333,25 +2350,28 @@ msgstr ""
 "系统中。请尝试在提示后输入 <code>vgalo</code> 来切换到较低分辨率。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:223
+#: en/installer.xml:217
+#, fuzzy
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
-"In this case it is worth trying a text mode installation. To use this hit "
-"ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
-"ENTER. Now continue with the installation in text mode."
+"In this case it is worth trying a text mode installation. To use this press "
+"<emphasis role=\"bold\">Esc</emphasis> at the first welcome screen and "
+"confirm with <emphasis role=\"bold\">ENTER</emphasis>. You will be presented "
+"with a black screen with the word \"boot:\". Type \"text\" and press "
+"<emphasis role=\"bold\">ENTER</emphasis> to continue with the installation "
+"in text mode."
 msgstr ""
 "若硬件较老，可能无法使用图形化安装程序。这种情况下，可以尝试文本安装模式：在"
 "首个欢迎界面中按 Esc，然后按 Enter。在出现的黑色屏幕中，输入“text”，然后按 "
 "Enter，即可进入文本安装模式。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:234
+#: en/installer.xml:230
 msgid "The Install Freezes"
 msgstr "安装停止"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:236
+#: en/installer.xml:232
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2364,14 +2384,15 @@ msgstr ""
 "以与其他选项联合使用。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:244
+#: en/installer.xml:240
 msgid "RAM problem"
 msgstr "内存问题"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:246
+#: en/installer.xml:242
+#, fuzzy
 msgid ""
-"These will rarely be needed, but in some cases the hardware may report the "
+"This will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
 "<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
 "g. <code>mem=256M</code> would specify 256MB of RAM."
@@ -2381,18 +2402,20 @@ msgstr ""
 "code> 表示 RAM 的大小为 256MB。"
 
 #. type: Content of: <section><section><section><title>
-#: en/installer.xml:253
+#: en/installer.xml:249
 msgid "Dynamic partitions"
 msgstr "动态分区"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:255
+#: en/installer.xml:251
+#, fuzzy
 msgid ""
-"If you converted your hard disk from \"basic\" format to \"dynamic\" format "
-"on Microsoft Windows, you must know that it is impossible to install Mageia "
-"on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"If you converted your hard disk from <emphasis role=\"bold\">basic</"
+"emphasis> format to <emphasis role=\"bold\">dynamic</emphasis> format in "
+"Microsoft Windows, then it is not possible to install Mageia on this disc. "
+"To revert to a basic disk, see the Microsoft documentation: <link ns2:href="
+"\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn."
+"microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
 "若您在微软 Windows 中将硬盘从“basic”格式转变为“dynamic”格式，该硬盘将无法用"
 "于 Mageia 安装。要将硬盘转变回“basic”格式，请参见微软的文档：<link ns2:href="
@@ -2409,18 +2432,18 @@ msgstr "更新"
 #.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
 #.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/installUpdates.xml:13
+#: en/installUpdates.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-installUpdates.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"installUpdates-im1\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:19
+#: en/installUpdates.xml:20
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
@@ -2429,18 +2452,20 @@ msgstr ""
 "改善。"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:23
+#: en/installUpdates.xml:24
+#, fuzzy
 msgid ""
-"Choose <guilabel>yes</guilabel> if you wish to download and install them, "
-"select <guilabel>no</guilabel> if you don't want to do this now, or if you "
+"Choose <guilabel>Yes</guilabel> if you wish to download and install them, "
+"select <guilabel>No</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
 msgstr ""
 "若您希望下载和安装更新后的软件包，请选择 <guilabel>是</guilabel>；若您不希望"
 "这样做，或无法连接到互联网，请选择 <guilabel>否</guilabel>。"
 
 #. type: Content of: <section><para>
-#: en/installUpdates.xml:28
-msgid "Then press <guibutton>Next</guibutton> to continue"
+#: en/installUpdates.xml:29
+#, fuzzy
+msgid "Press <guibutton>Next</guibutton> to continue"
 msgstr "然后按<guibutton>下一步</guibutton>继续"
 
 #. type: Content of: <section><info><title>
@@ -2496,18 +2521,18 @@ msgstr "介质选择 (Nonfree)"
 #.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
-#: en/media_selection.xml:12
+#: en/media_selection.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"media_selection-im1\" align="
+"\"center\" revision=\"1\" fileref=\"dx2-media_selection.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/media_selection.xml:18
+#: en/media_selection.xml:20
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
 "available, according to which media you use for installing. The repositories "
@@ -2518,14 +2543,14 @@ msgstr ""
 "决定下一步中可用的软件包。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:25
+#: en/media_selection.xml:27
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
 msgstr "<emphasis>Core</emphasis> 仓库无法被禁用，因其包含发行版中的基础软件。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:30
+#: en/media_selection.xml:32
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
 "of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
@@ -2538,71 +2563,76 @@ msgstr ""
 "等。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/media_selection.xml:38
+#: en/media_selection.xml:40
+#, fuzzy
 msgid ""
 "The <emphasis>Tainted</emphasis> repository includes packages released under "
 "a free license. The main criteria for placing packages in this repository is "
 "that they may infringe patents and copyright laws in some countries, e.g. "
-"Multimedia codecs needed to play various audio/video files; packages needed "
-"to play commercial video DVD, etc."
+"multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD's, etc."
 msgstr ""
 "<emphasis>Tainted</emphasis> 仓库包含了在自由许可证下发布的软件。将这些软件包"
 "归入 Tainted 仓库是因为它们可能会违反部分国家（地区）的专利或版权法，例如：用"
 "于播放音频/视频文件的多媒体解码器，用于播放商业视频 DVD 的软件等。"
 
 #. type: Content of: <section><info><title>
-#: en/minimal-install.xml:12
+#: en/minimal-install.xml:3
 msgid "Minimal Install"
 msgstr "最小安装"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:19
+#: en/minimal-install.xml:11
+#, fuzzy
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
-"xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"/>."
 msgstr ""
 "在软件包组选择窗口中，您可以通过取消选择所有项来实现最小化安装，参见 <xref "
 "linkend=\"choosePackageGroups\"></xref>。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:22
+#: en/minimal-install.xml:14
+#, fuzzy
 msgid ""
-"If desired, you can additionally tick the \"Individual package selection\" "
-"option in the same screen."
+"If desired, you can additionally tick the <emphasis role=\"bold\">Individual "
+"package selection</emphasis> option in the same screen."
 msgstr "若需要，您可以在该窗口中勾选“独立选择软件包”选项。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:24
+#: en/minimal-install.xml:17
+#, fuzzy
 msgid ""
 "Minimal Installation is intended for those with specific uses in mind for "
-"their <application>Mageia</application>, such as a server or a specialised "
-"workstation. You will probably use this option combined with the "
-"\"Individual package selection\" option mentioned above, to fine-tune your "
-"installation, see <xref linkend=\"choosePackagesTree\"></xref>."
+"<application>Mageia</application>, such as a server or a specialised "
+"workstation. You will probably use this option combined with the <emphasis "
+"role=\"bold\">Individual package selection</emphasis> option mentioned "
+"above, to fine-tune your installation, see <xref linkend=\"choosePackagesTree"
+"\"/>."
 msgstr ""
 "最小化安装通常被用于在服务器或特定工作站上安装 Mageia。您可能会将此选项与“独"
 "立软件包选择”选项配合使用，以便微调您的安装配置，参见 <xref linkend="
 "\"choosePackagesTree\"></xref>。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:29
+#: en/minimal-install.xml:22
+#, fuzzy
 msgid ""
-"If you choose this installation class, then the related screen will offer "
+"If you choose this installation method, then the relevant screen will offer "
 "you a few useful extras to install, such as documentation and X."
 msgstr ""
 "若您选择了安装类别，相应的窗口将会为您展示一些额外的有用软件，例如 X 服务的文"
 "档。"
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:31
+#: en/minimal-install.xml:26
 msgid ""
-"If selected, \"With X\" will also include IceWM as lightweight desktop "
-"environment."
-msgstr "若选中“包含 X”，将会同时选定 IceWM 作为轻量级的桌面环境。"
+"If <emphasis role=\"bold\">With X</emphasis> is chosen, then IceWM (a "
+"lightweight desktop environment) will also be included."
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/minimal-install.xml:33
+#: en/minimal-install.xml:29
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
 "contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
@@ -2616,15 +2646,15 @@ msgstr ""
 "manual/\">GNU coreutils</link> 的 info 帮助页。"
 
 #. type: Content of: <section><mediaobject>
-#: en/minimal-install.xml:41
+#: en/minimal-install.xml:35
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"minimal-install-im1\" align="
+"\"center\" fileref=\"dx2-minimal-install.png\" revision=\"1\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
-"</imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
@@ -2641,20 +2671,22 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:15
+#, fuzzy
 msgid ""
-"DrakX made smart choices for the configuration of your system depending on "
-"the choices you made and on the hardware DrakX detected. You can check the "
-"settings here and change them if you want after pressing "
-"<guibutton>Configure</guibutton>."
+"DrakX presents a proposal for the configuration of your system depending on "
+"the choices you made and on the hardware detected. You can check the "
+"settings here and change them if you want by pressing <guibutton>Configure</"
+"guibutton>."
 msgstr ""
 "DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更"
 "改它们（点击 <guibutton>配置</guibutton> 按钮）。"
 
 #. type: Content of: <section><note><para>
 #: en/misc-params.xml:21
+#, fuzzy
 msgid ""
-"As a general rule, default settings are recommended and you can keep them "
-"with 3 exceptions:"
+"As a general rule, it is recommended that you accept the default settings "
+"unless:"
 msgstr "一般而言，您可以直接使用推荐配置，除非您遇到以下三种情况："
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
@@ -2669,70 +2701,74 @@ msgstr "您尝试了默认配置，但安装失败"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:32
-msgid "something else is said in the detailed sections below"
+#, fuzzy
+msgid ""
+"some other factor mentionned in the detailed sections below is an issue."
 msgstr "后续章节中所提到的其他情况"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:39
+#: en/misc-params.xml:40
 msgid "System parameters"
 msgstr "系统参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:44
+#: en/misc-params.xml:45
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>时区</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:46
+#: en/misc-params.xml:47
+#, fuzzy
 msgid ""
-"DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
-">"
+"DrakX selects a time zone for you, depending on your preferred language. You "
+"can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/>"
 msgstr ""
 "DrakX 根据您的语言设置自动选择了时区。您也可以手动改变时区。参见 <xref "
 "linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:53
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>国家/地区</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:55
+#: en/misc-params.xml:56
+#, fuzzy
 msgid ""
-"If you are not in the selected country, it is very important that you "
-"correct the setting. See <xref linkend=\"selectCountry\"/>"
+"If the selected country is wrong, it is very important that you correct the "
+"setting.  See <xref linkend=\"selectCountry\"/>"
 msgstr ""
 "若您不在所选国家/地区中，请务必对其进行正确设置。参见 <xref linkend="
 "\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:62
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>引导器</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:63
+#: en/misc-params.xml:64
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX 为引导器进行了自动设置。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:66
-msgid "Do not change anything, unless you know how to configure Grub2"
+#: en/misc-params.xml:67
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure GRUB2"
 msgstr "除非您懂得如何配置 GRUB 2，否则请勿更改这些配置"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:70
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "更多信息，参见 <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:74
+#: en/misc-params.xml:75
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>用户管理</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:77
+#: en/misc-params.xml:78
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2741,49 +2777,51 @@ msgstr ""
 "目录。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:84
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>服务</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:85
+#: en/misc-params.xml:86
+#, fuzzy
 msgid ""
-"System services refer to those small programs which run the background "
-"(daemons). This tool allows you to enable or disable certain tasks."
+"System services refer to those small programs which run in the background "
+"(daemons).  This tool allows you to enable or disable certain processes."
 msgstr ""
 "系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:90
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
 msgstr "在做出更改之前，请认真审视选项 - 任何错误都可能导致系统无法正常运行。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:93
+#: en/misc-params.xml:94
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "更多信息，参见 <xref linkend=\"configureServices\"/>."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:100
+#: en/misc-params.xml:101
 msgid "Hardware parameters"
 msgstr "硬件参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:105
+#: en/misc-params.xml:106
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>键盘</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:107
+#: en/misc-params.xml:108
+#, fuzzy
 msgid ""
-"This is where you setup or change your keyboard layout which will depend on "
-"your location, language or type of keyboard."
+"Configure your keyboard layout according to your location, language and type "
+"of keyboard."
 msgstr "在这里，您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><note><para>
-#: en/misc-params.xml:112
+#: en/misc-params.xml:113
 msgid ""
 "If you notice a wrong keyboard layout and want to change it, keep in mind "
 "that your passwords are going to change too."
@@ -2792,49 +2830,50 @@ msgstr ""
 "发生改变。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:118
+#: en/misc-params.xml:119
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>鼠标</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:120
+#: en/misc-params.xml:121
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr "您可以添加或配置其他触控设备、平板、轨迹球等。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:125
+#: en/misc-params.xml:126
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>声卡</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:128
+#: en/misc-params.xml:129
+#, fuzzy
 msgid ""
-"The installer uses the default driver, if there is a default one. The option "
-"to select a different driver is only given when there is more than one "
-"driver for your card, but none of them is the default one."
+"The installer uses the default driver - if there is a default one. The "
+"option to select a different driver is only given when there is more than "
+"one driver for your card, but where none of them is the default one."
 msgstr ""
 "安装器将会使用默认驱动（如果有的话）。只有存在多个可用驱动（且均不是默认驱"
 "动）时，才会提示您进行选择。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:135
+#: en/misc-params.xml:137
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>图形界面</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:138
+#: en/misc-params.xml:140
 msgid "This section allows you to configure your graphic card(s) and displays."
 msgstr "您可以在这里配置显卡和显示器。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:141
+#: en/misc-params.xml:143
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "更多信息，参见 <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:147
+#: en/misc-params.xml:149
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
@@ -2843,20 +2882,21 @@ msgstr ""
 "\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:155
+#: en/misc-params.xml:157
 msgid "Network and Internet parameters"
 msgstr "网络和 Internet 参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:161
+#: en/misc-params.xml:163
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>网络</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:163
+#: en/misc-params.xml:165
+#, fuzzy
 msgid ""
 "You can configure your network here, but for network cards with non-free "
-"drivers it is better to do that after reboot, in the <application>Mageia "
+"drivers it is better to do that after reboot, using the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
 msgstr ""
@@ -2864,19 +2904,20 @@ msgstr ""
 "Nonfree 软件仓库，那么您最好等到重启后再进行这一操作。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:170
+#: en/misc-params.xml:172
+#, fuzzy
 msgid ""
-"When you add a network card, do not forget to set your firewall to watch "
+"When you add a network card, do not forget to set your firewall to monitor "
 "that interface as well."
 msgstr "当您添加了网卡后，请不要忘记用防火墙对该接口进行管理。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:177
+#: en/misc-params.xml:179
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>代理</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:179
+#: en/misc-params.xml:181
 msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
@@ -2886,48 +2927,49 @@ msgstr ""
 "服务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:184
+#: en/misc-params.xml:186
+#, fuzzy
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
-"need to enter here"
+"need to enter here."
 msgstr "您可能需要咨询系统管理员来获取此处应当填写的参数"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:193
+#: en/misc-params.xml:195
 msgid "Security"
 msgstr "安全"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:198
+#: en/misc-params.xml:200
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>安全等级</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:201
+#: en/misc-params.xml:203
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
 msgstr "您可以在这里设置计算机的安全等级，一般情况下可以使用默认设置（标准）。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:205
+#: en/misc-params.xml:207
 msgid "Check the option which best suits your usage."
 msgstr "请勾选您认为合适的选项。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:210
+#: en/misc-params.xml:212
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>防火墙</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:212
+#: en/misc-params.xml:214
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
 msgstr "防火墙将保护您的重要数据，以免其被他人恶意利用或窃取。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:216
+#: en/misc-params.xml:218
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -2937,7 +2979,7 @@ msgstr ""
 "<xref linkend=\"firewall\"/>。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:222
+#: en/misc-params.xml:224
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "请牢记：允许所有服务（即不启用防火墙）是非常危险的。"
 
@@ -3003,39 +3045,73 @@ msgstr ""
 "<application>Mageia</application>）。"
 
 #. type: Content of: <section><info><title>
-#: en/securityLevel.xml:12
+#: en/securityLevel.xml:3
 msgid "Security Level"
 msgstr "安全级别"
 
 #.  2012-12-25 marja - moved this part out of misc-params.xml" 
 #.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
+#: en/securityLevel.xml:11
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"securityLevel-im1\" align="
+"\"center\" fileref=\"dx2-securityLevel.png\" revision=\"1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:16
+#, fuzzy
+msgid ""
+"<emphasis role=\"bold\">Please choose the desired security level</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><para>
 #: en/securityLevel.xml:19
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
+"<emphasis role=\"bold\">Standard</emphasis> is the default, and recommended "
+"setting for the average user. The <emphasis role=\"bold\">Secure</emphasis> "
+"setting will create a highly protected system - for instance if the system "
+"is to be used as a public server."
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
-msgid "You can adjust your security level here."
-msgstr "您可以在这里调整安全等级。"
+#, fuzzy
+msgid "<emphasis role=\"bold\">Security Administrator</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:27
+#: en/securityLevel.xml:26
+msgid ""
+"This item allows you to configure an email address to which the system will "
+"send <emphasis>security alert messages</emphasis> when it detects situations "
+"which require notification to a system administrator."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/securityLevel.xml:31
+msgid ""
+"A good, and easy-to-implement, choice is to enter &lt;user>@localhost - "
+"where &lt;user> is the login name of the user to receive these messages."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/securityLevel.xml:36
 msgid ""
-"Leave the default settings as they are, if you don't know what to choose."
-msgstr "若您不确定如何选择，请使用默认设置。"
+"The system sends such messages as <emphasis role=\"bold\">Unix Mailspool "
+"messages</emphasis>, not as \"ordinary\" SMTP mail: this user must therefore "
+"be configured for receiving such mail!"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/securityLevel.xml:30
+#: en/securityLevel.xml:41
+#, fuzzy
 msgid ""
 "After install, it will always be possible to adjust your security settings "
-"in the <guilabel>Security</guilabel> part of the Mageia Control Center."
+"in the <guilabel>Security</guilabel> section of the Mageia Control Center."
 msgstr ""
 "在安装之后，您也可以在 Mageia 控制中心中的 <guilabel>安全</guilabel> 选项卡里"
 "调整安全设置。"
@@ -3052,209 +3128,221 @@ msgstr "简介"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:10
+#, fuzzy
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
-"which image match your needs."
+"which image best suits your needs."
 msgstr "Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。"
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:12
-msgid "There is two families of media:"
+#, fuzzy
+msgid "There are two families of media:"
 msgstr "有两种类型的媒介："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:15
+#, fuzzy
 msgid ""
-"Classical installer: After booting the media, it will follow a process "
-"allowing to choose what to install and how to configure your target system. "
-"This give you the maximal flexibility for a customized installation, in "
-"particular to choose which Desktop Environment you will install."
+"Classical installer: Booting with this media provides you with the maximum "
+"flexibility when choosing what to install, and for configuring your system. "
+"In particular, you have a choice of which Desktop environment to install"
 msgstr ""
 "传统安装器：在引导之后，程序将提供一系列用于安装和配置目标系统的选项。这种安"
 "装类型可以给予您最大限度的灵活性，尤其是选择所需安装的桌面环境。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:22
+#: en/SelectAndUseISOs2.xml:21
 msgid ""
-"LIVE media: you can boot the media in a real Mageia system without "
-"installing it, to see what you will get after installation.  The "
-"installation process is simpler, but you get lesser choices."
+"LIVE media: This option allows you to try out Mageia without having to "
+"actually install it, or make any changes to your computer.  If the "
+"installation is decided, the process is simpler, but you get fewer choices "
+"than offered by the Classical installer"
 msgstr ""
-"Live 媒介：您无需实际安装即可实际体验 Mageia 系统，以便确定系统被安装之后的模"
-"样。这种安装的过程更加简单，但您可做的选择也相应减少。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:28
+#: en/SelectAndUseISOs2.xml:27
 msgid "Details are given in the next sections."
 msgstr "下一节中将涉及有关细节。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:31
+#: en/SelectAndUseISOs2.xml:30
 msgid "Media"
 msgstr "介质"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:32
 msgid "Definition"
 msgstr "定义"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:34
+#: en/SelectAndUseISOs2.xml:33
+#, fuzzy
 msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
-"install and/or update Mageia and by extension any physical support the ISO "
-"file is copied to."
+"install and/or update Mageia and by extension any physical support (DVD, USB "
+"stick, ...) the ISO file is copied to."
 msgstr ""
 "媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:36
+#, fuzzy
 msgid ""
-"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
-"\">here</link>."
+"You can find Mageia ISO's <link ns4:href=\"http://www.mageia.org/en/"
+"downloads/\">here</link>."
 msgstr ""
 "您可以在<link ns4:href=\"http://www.mageia.org/en/downloads/\">这里</link>找"
 "到它们。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:39
 msgid "Classical installation media"
 msgstr "传统安装媒介"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:42 en/SelectAndUseISOs2.xml:73
-#: en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:41 en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:141
 msgid "Common features"
 msgstr "通用特性"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:45
-msgid "These ISOs use the traditional installer called drakx."
+#: en/SelectAndUseISOs2.xml:44
+#, fuzzy
+msgid "These ISOs use the Classical installer called drakx."
 msgstr "这些 ISO 使用传统的安装器（drakx）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:49
+#: en/SelectAndUseISOs2.xml:47
+#, fuzzy
 msgid ""
-"They are able to make a clean install or an update from previous releases."
+"They are used for performing clean installs or to upgrade a previously "
+"installed version of Mageia."
 msgstr "它们可以用于全新安装，或更新之前的版本。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:84
-#: en/SelectAndUseISOs2.xml:159
-msgid "Different media for 32 or 64 bit architectures."
+#: en/SelectAndUseISOs2.xml:51 en/SelectAndUseISOs2.xml:83
+#: en/SelectAndUseISOs2.xml:158
+#, fuzzy
+msgid "Different media for 32 and 64 bit architectures."
 msgstr "媒介有 32 位和 64 位两种架构之分。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:56
+#: en/SelectAndUseISOs2.xml:54
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
 msgstr "欢迎屏幕中列出了一些可用的工具，如：救援系统、内存测试、硬件检测工具。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:60
+#: en/SelectAndUseISOs2.xml:58
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "每个 DVD 中包含多种桌面环境和语言支持。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:64
+#: en/SelectAndUseISOs2.xml:62
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "您可以在安装时添加非自由软件。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:71
+#: en/SelectAndUseISOs2.xml:69
 msgid "Live media"
 msgstr "Live 媒介"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:76
+#: en/SelectAndUseISOs2.xml:74
+#, fuzzy
 msgid ""
-"Can be used to preview the distribution without installing it on a HDD, and "
-"optionally install Mageia on to your HDD."
+"Can be used to preview the Mageia operating system without having to install "
+"it. Can also be used to install Mageia if you wish."
 msgstr ""
 "可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:80
+#: en/SelectAndUseISOs2.xml:79
 msgid "Each ISO contains only one desktop environment (Plasma, GNOME or Xfce)."
 msgstr "每个 ISO 仅包含一种桌面环境（KDE Plasma、GNOME 或 Xfce）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:86
+#, fuzzy
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous releases.</"
-"emphasis>"
+"installations, they cannot be used to upgrade previously installed Mageia "
+"releases.</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Live ISO 仅能用于全新安装，而无法对之前的版本进行升"
 "级。</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:92
+#: en/SelectAndUseISOs2.xml:91
 msgid "They contain non free software."
 msgstr "其中包含非自由软件。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:97
+#: en/SelectAndUseISOs2.xml:96
 msgid "Live DVD Plasma"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:99
 msgid "Plasma desktop environment only."
 msgstr "仅包含 KDE（Plasma）桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103 en/SelectAndUseISOs2.xml:117
-#: en/SelectAndUseISOs2.xml:131
-msgid "All languages are present."
+#: en/SelectAndUseISOs2.xml:102 en/SelectAndUseISOs2.xml:116
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "All available languages are present."
 msgstr "包含所有语言支持。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:106
+#: en/SelectAndUseISOs2.xml:105
 msgid "64 bit architecture only."
 msgstr "仅支持 64 位处理器。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:111
+#: en/SelectAndUseISOs2.xml:110
 msgid "Live DVD GNOME"
 msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:114
+#: en/SelectAndUseISOs2.xml:113
 msgid "GNOME desktop environment only."
 msgstr "仅包含 GNOME 桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:120
+#: en/SelectAndUseISOs2.xml:119
 msgid "64 bit architecture only"
 msgstr "仅支持 64 位处理器"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:125
+#: en/SelectAndUseISOs2.xml:124
 msgid "Live DVD Xfce"
 msgstr "Live DVD Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:128
+#: en/SelectAndUseISOs2.xml:127
 msgid "Xfce desktop environment only."
 msgstr "仅包含 Xfce 桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:134
+#: en/SelectAndUseISOs2.xml:133
 msgid "32 or 64 bit architectures."
 msgstr "同时支持 32 位和 64 位处理器。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:140
-msgid "Boot-only CD media"
-msgstr "仅用于引导的 CD"
+#: en/SelectAndUseISOs2.xml:139
+#, fuzzy
+msgid "Net install media"
+msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:145
+#: en/SelectAndUseISOs2.xml:144
+#, fuzzy
 msgid ""
-"Each one is a small image that contains no more than that which is needed to "
+"These are minimal ISO's containing no more than that which is needed to "
 "start the drakx installer and find drakx-installer-stage2 and other packages "
 "that are needed to continue and complete the install. These packages may be "
 "on the PC hard disk, on a local drive, on a local network or on the Internet."
@@ -3264,27 +3352,29 @@ msgstr ""
 "络或互联网。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:153
+#: en/SelectAndUseISOs2.xml:152
+#, fuzzy
 msgid ""
-"These media are very light (less than 100 MB) and are convenient when "
-"bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
-"PC that can't boot from a USB stick."
+"These media are very light (less than 100 MB) and are convenient if "
+"bandwidth is too low to download a full DVD, or if you have a PC without a "
+"DVD drive or is unable to boot from a USB stick."
 msgstr ""
 "这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器"
 "或不支持 USB 引导的电脑。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:162
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:161
+#, fuzzy
+msgid "First steps are English language only."
 msgstr "仅包含英语支持。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:167
+#: en/SelectAndUseISOs2.xml:166
 msgid "netinstall.iso"
 msgstr "netinstall.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:170
+#: en/SelectAndUseISOs2.xml:169
 msgid ""
 "Contains only free software, for those people who prefer not to use non-free "
 "software."
@@ -3314,11 +3404,12 @@ msgstr "下载中"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:189
+#, fuzzy
 msgid ""
 "Once you have chosen your ISO file, you can download it using either http or "
-"BitTorrent. In both cases, a window gives you some information, such as the "
-"mirror in use and an opportunity to change if the bandwidth is to low. If "
-"http is chosen, you may also see something like"
+"BitTorrent. In both cases, you are provided with some information, such as "
+"the mirror in use and an option to switch if the bandwidth is too low. If "
+"http is chosen, you will also see something regarding checksums."
 msgstr ""
 "在选择了 ISO 文件后，您可以通过 HTTP 或 BitTorrent 下载它。相应的窗口中将会提"
 "示您正在使用的镜像源，并在速度太慢时提醒您更换镜像源。若您使用 HTTP 方式下"
@@ -3331,10 +3422,11 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:195
+#, fuzzy
 msgid ""
-"md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
-"Then a window similar to this one appears:"
+"md5sum and sha1sum are tools to check the ISO integrity. Choose one or the "
+"other, and copy the checksum <link linkend=\"integrity\">for later use</"
+"link>. Then a window similar to this one appears:"
 msgstr ""
 "md5sum 和 sha1sum 是用于检查 ISO 文件完整性的工具，只需使用其中一种即可。请您"
 "保留它们以便<link linkend=\"integrity\">后续使用</link>。之后，窗口将会显示："
@@ -3346,8 +3438,8 @@ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:203
-msgid "Check the radio button Save File."
-msgstr "点击“保存文件”选项。"
+msgid "Select the Save File option, then, click OK."
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:206
@@ -3355,14 +3447,15 @@ msgid "Checking the integrity of the downloaded media"
 msgstr "检查下载文件的完整性"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:207
+#: en/SelectAndUseISOs2.xml:208
+#, fuzzy
 msgid ""
-"Both checksums are hexadecimal numbers calculated by an algorithm from the "
-"file to be downloaded. When you ask these algorithms to recalculate this "
-"number from your downloaded file, either you have the same number and your "
-"downloaded file is correct, or the number is different and you have a "
-"failure. A failure infers that you should retry the download or attempt a "
-"repair using BitTorrent."
+"The checksums referred to earlier, are digital fingerprints generated by an "
+"algorithm from the file to be downloaded. You may compare the checksum of "
+"your downloaded ISO against that of the original source ISO. If the "
+"checksums do not match, it means that the actual data on the ISO's do not "
+"match, and if it is the case, then you should retry the download or attempt "
+"a repair using BitTorrent."
 msgstr ""
 "这两种校验和均由特定算法计算文件内容产生，且均为十六进制数字。当您使用这些算"
 "法来重新计算下载文件的校验值时，如果您得到的结果和 Mageia 提供的一致，说明您"
@@ -3370,79 +3463,94 @@ msgstr ""
 "载。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:213
-msgid "Open a console, no need to be root, and:"
+#: en/SelectAndUseISOs2.xml:214
+#, fuzzy
+msgid ""
+"To generate the checksum for your downloaded ISO, open a console, (no need "
+"to be root), and:"
 msgstr "打开一个终端（无需以 root 身份操作），然后："
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:214
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
-"file.iso</userinput>."
+"To use md5sum, type: <userinput>md5sum path/to/the/image/file.iso</"
+"userinput>."
 msgstr ""
 "- 若使用 md5sum，请输入：[sam@localhost]$ <userinput>md5sum path/to/the/"
 "image/file.iso</userinput>。"
 
-#. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:216
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
+#, fuzzy
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
-"image/file.iso</userinput>."
+"To use sha1sum, type: <userinput>sha1sum path/to/the/image/file.iso</"
+"userinput>"
 msgstr ""
 "- 若使用 sha1sum，请输入：[sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:218
-msgid ""
-"and compare the obtained number on your computer (you may have to wait for a "
-"while) with the number given by Mageia. Example:"
+#: en/SelectAndUseISOs2.xml:226
+msgid "Example:"
 msgstr ""
-"然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:221
+#: en/SelectAndUseISOs2.xml:228
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
+#. type: Content of: <section><section><section><para>
+#: en/SelectAndUseISOs2.xml:232
+#, fuzzy
+msgid ""
+"and compare the result (you may have to wait for a while) with the checksum "
+"provided by Mageia."
+msgstr ""
+"然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
+
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:229
+#: en/SelectAndUseISOs2.xml:237
 msgid "Burn or dump the ISO"
 msgstr "刻录或转储 ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:230
+#: en/SelectAndUseISOs2.xml:238
+#, fuzzy
 msgid ""
-"The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
-"These operations are not a simple copy and aim to make a bootable medium."
+"The verified ISO can now be burned to a CD/DVD or dumped to a USB stick. "
+"This is not a standard copy operation as a bootable medium will actually be "
+"created."
 msgstr ""
 "经过检查后的 ISO 即可被刻录至 CD/DVD，或写入到 U 盘。这些操作不同于简单的复"
 "制，其目的是创建一个可引导的媒体。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:234
+#: en/SelectAndUseISOs2.xml:242
 msgid "Burning the ISO to a CD/DVD"
 msgstr "将ISO文件刻录到CD或DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:235
+#: en/SelectAndUseISOs2.xml:243
+#, fuzzy
 msgid ""
-"Use whatever burner you wish but ensure the burning device is set correctly "
-"to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link ns4:href=\"https://wiki."
-"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+"Whichever software you use, ensure that the option to burn an<emphasis role="
+"\"bold\"> image</emphasis> is used, burn <emphasis role=\"bold\">data</"
+"emphasis> or <emphasis role=\"bold\">files</emphasis> is not correct. Seen "
+"the <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images"
+"\">the Mageia wiki</link> for more information."
 msgstr ""
 "您可以刻录任何所需镜像，但请确保刻录设备的模式被设为<emphasis role=\"bold\">"
 "刻录镜像</emphasis>，而非刻录数据或文件。更多信息请见 <link ns4:href="
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wiki</link>。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:248
 msgid "Dump the ISO to a USB stick"
 msgstr "写入 ISO 到 U 盘"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:242
+#: en/SelectAndUseISOs2.xml:249
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
@@ -3451,29 +3559,30 @@ msgstr ""
 "U 盘来引导和安装系统。"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:245
+#: en/SelectAndUseISOs2.xml:252
+#, fuzzy
 msgid ""
 "\"Dumping\" an image onto a flash device destroys any previous file-system "
-"on the device; any other data will be lost and the partition capacity will "
-"be reduced to the image size."
+"on the device; any existing data will be lost and the partition capacity "
+"will be reduced to the image size."
 msgstr ""
 "“转储”镜像至闪存设备将会破坏设备上原先的文件系统，任何数据都将丢失，并且分区"
 "容量将会（暂时）缩减为镜像大小。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:249
+#: en/SelectAndUseISOs2.xml:256
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
 msgstr "若要恢复原始容量，您必须重新进行分区和格式化操作。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:252
+#: en/SelectAndUseISOs2.xml:259
 msgid "Using a graphical tool within Mageia"
 msgstr "使用 Mageia 的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:253
+#: en/SelectAndUseISOs2.xml:260
 msgid ""
 "You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
@@ -3483,99 +3592,110 @@ msgstr ""
 "具来操作。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:256
+#: en/SelectAndUseISOs2.xml:263
 msgid "Using a graphical tool within Windows"
 msgstr "使用 Windows 下的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:257
+#: en/SelectAndUseISOs2.xml:264
 msgid "You could try:"
 msgstr "您可以尝试："
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:258
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:267
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
-"the \"ISO image\" option;"
+"<link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using the "
+"\"ISO image\" option;"
 msgstr ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> 中"
 "的“ISO 镜像”选项；"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:260
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:271
+#, fuzzy
 msgid ""
-"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"<link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:264
+#: en/SelectAndUseISOs2.xml:277
 msgid "Using Command line within a GNU/Linux system"
 msgstr "使用 GNU/Linux 系统中的命令行程序"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:266
+#: en/SelectAndUseISOs2.xml:279
+#, fuzzy
 msgid ""
-"It is potentially *dangerous* to do this by hand. You risk to overwrite a "
-"disc partition if you get the device-ID wrong."
+"It is potentially *dangerous* to do this by hand. You risk overwriting "
+"potentially valuable existing data if you specify the wrong target device."
 msgstr ""
 "手动进行此操作有潜在 *危险*。如果您弄错了设备 ID，可能会覆盖掉其他分区中的数"
 "据。"
 
-#. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:269
-msgid "You can also use the dd tool in a console:"
-msgstr "您也可以在终端中使用 dd 工具："
-
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:272
+#: en/SelectAndUseISOs2.xml:285
 msgid "Open a console"
 msgstr "打开一个终端"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:275
+#: en/SelectAndUseISOs2.xml:288
+#, fuzzy
 msgid ""
-"Become root with the command <userinput>su -</userinput> (don't forget the "
-"final '-' )"
+"Become a root (Administrator) user with the command <userinput>su -</"
+"userinput> (don't forget the final '-' )"
 msgstr ""
 "使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:278
+#: en/SelectAndUseISOs2.xml:291
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:284
+#: en/SelectAndUseISOs2.xml:297
 msgid ""
 "Plug in your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
 msgstr "插入您的 U 盘（无需挂载，并且不要用任何应用程序或文件管理器访问它）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:289
+#: en/SelectAndUseISOs2.xml:302
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "输入命令 <userinput>fdisk -l</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:291
+#: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:295
+#: en/SelectAndUseISOs2.xml:310
+#, fuzzy
 msgid ""
-"Alternatively, you can get the device name with the command <code>dmesg</"
-"code>: at end, you see the device name starting with <emphasis>sd</"
-"emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is an 8GB USB stick."
+msgstr ""
+"通过磁盘大小来确认您的 U 盘的设备名，例如图中所示的 <code>/dev/sdb</code>，是"
+"一个 8GB 的 U 盘。"
+
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:312
+#, fuzzy
+msgid ""
+"Alternatively, you can find the device name with the command <code>dmesg</"
+"code>: towards the end of this example, you can see the device name starting "
+"with <emphasis>sd</emphasis>, and in this case, <emphasis> sdd</emphasis> is "
+"the actual device. You can also see thaat its size is 2GB:"
 msgstr ""
 "或者，您也可以通过命令 <code>dmesg</code> 来查看设备名：在输入末尾，您将看到"
 "以 <emphasis>sd</emphasis> 开头的设备名，如 <emphasis>sdd</emphasis>"
 
-#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:299
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para><screen>
+#: en/SelectAndUseISOs2.xml:317
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3617,45 +3737,54 @@ msgstr ""
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:319
-msgid ""
-"Find the device name for your USB stick (by its size), for example <code>/"
-"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
-msgstr ""
-"通过磁盘大小来确认您的 U 盘的设备名，例如图中所示的 <code>/dev/sdb</code>，是"
-"一个 8GB 的 U 盘。"
+#: en/SelectAndUseISOs2.xml:317
+#, 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:324
+#: en/SelectAndUseISOs2.xml:337
+#, fuzzy
 msgid ""
-"Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
-"bs=1M</userinput>"
+"Enter the command: <emphasis role=\"bold\"># <userinput>dd if=path/to/the/"
+"ISO/file of=/dev/sdX bs=1M</userinput></emphasis>"
 msgstr ""
 "输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:326
-msgid "Where X=your device name eg: /dev/sdc"
+#: en/SelectAndUseISOs2.xml:340
+#, fuzzy
+msgid "Where X=your device name eg: /dev/sdd"
 msgstr "其中，“X”是您的设备名（如：/dev/sdc）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:327
+#: en/SelectAndUseISOs2.xml:341
+#, fuzzy
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
-"dev/sdb bs=1M</userinput>"
+"Example:<emphasis role=\"bold\"> # <userinput>dd if=/home/user/Downloads/"
+"Mageia-6-x86_64-DVD.iso of=/dev/sdd bs=1M</userinput></emphasis>"
 msgstr ""
 "示例：# <userinput>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 
+#. type: Content of: <section><section><section><section><orderedlist><listitem><tip><para>
+#: en/SelectAndUseISOs2.xml:345
+msgid ""
+"It might helpful to know that <emphasis role=\"bold\">if</emphasis> stands "
+"for <emphasis role=\"bold\">i</emphasis>nput <emphasis role=\"bold\">f</"
+"emphasis>ile and <emphasis role=\"bold\">of</emphasis> stands for <emphasis "
+"role=\"bold\">o</emphasis>utput <emphasis role=\"bold\">f</emphasis>ile"
+msgstr ""
+
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:330
+#: en/SelectAndUseISOs2.xml:349
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "输入命令：# <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:333
-msgid "Unplug your USB stick, it is done"
-msgstr "操作完成，拔下 U 盘"
+#: en/SelectAndUseISOs2.xml:352
+msgid "This is the end of the process, and you may now unplug your USB stick."
+msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:3
@@ -3684,37 +3813,40 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:19
+#, fuzzy
 msgid ""
 "If your country isn't in the list, click the <guilabel>Other Countries</"
-"guilabel> button and choose your country / region there."
+"guilabel> option and choose your country / region there."
 msgstr ""
 "若列表中不包含您的国家，请点击 <guilabel>其他国家</guilabel> 按钮并选择相应的"
 "国家/区域。"
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:24
+#, fuzzy
 msgid ""
 "If your country is only in the <guilabel>Other Countries</guilabel> list, "
-"after clicking <guibutton>OK</guibutton> it may seem a country from the "
-"first list was chosen. Please ignore this, DrakX will follow your real "
+"after clicking <guibutton>OK</guibutton> it may seem that a country from the "
+"first list was chosen. Please ignore this, as DrakX will apply your actual "
 "choice."
 msgstr ""
 "若您的国家仅在 <guilabel>其他国家</guilabel> 列表中列出，在点击 <guibutton>确"
 "定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。"
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:32
+#: en/selectCountry.xml:33
 msgid "Input method"
 msgstr "输入法"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:35
+#: en/selectCountry.xml:36
+#, fuzzy
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
 "input method (at the bottom of the list). Input methods allow users to input "
 "multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method, so users should not need to configure it manually. "
-"Other input methods(SCIM, GCIN, HIME, etc) also provide similar functions "
+"Other input methods (SCIM, GCIN, HIME, etc) also provide similar functions "
 "and can be installed if you added HTTP/FTP media before package selection."
 msgstr ""
 "在 <guilabel>其他国家</guilabel> 窗口中，您也可以选择一种输入法（位于列表底"
@@ -3723,79 +3855,83 @@ msgstr ""
 "能，您可以在选择软件包前通过添加 HTTP/FTP 媒体来安装它们。"
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:44
+#: en/selectCountry.xml:45
+#, fuzzy
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -> "
-"\"System\", or by running localedrake as root."
+"after you boot your installed system via <emphasis role=\"bold\">Configure "
+"your Computer</emphasis> -> <emphasis role=\"bold\">System</emphasis>, or by "
+"running localedrake as root."
 msgstr ""
 "若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”->“系统”设置来"
 "安装输入法，或者以 root 身份运行 localedrake。"
 
 #. type: Content of: <section><info><title>
-#: en/selectInstallClass.xml:21
+#: en/selectInstallClass.xml:14
 msgid "Install or Upgrade"
 msgstr "新安装或升级"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectInstallClass.xml:25
+#: en/selectInstallClass.xml:18
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" align=\"center\" fileref=\"dx2-"
+"selectInstallClass.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
-"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:32
+#: en/selectInstallClass.xml:25
 msgid "Install"
 msgstr "安装"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:34
+#: en/selectInstallClass.xml:27
 msgid ""
-"Use this option for a fresh <application>Mageia</application> installation."
-msgstr "使用此选项来进行全新 <application>Mageia</application> 安装。"
+"Use this option to perform a fresh installation of <application>Mageia</"
+"application>. This will format the root partition (/), but can preserve a "
+"separated /home partition."
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:39
+#: en/selectInstallClass.xml:33
 msgid "Upgrade"
 msgstr "升级"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectInstallClass.xml:41
+#: en/selectInstallClass.xml:35
 msgid ""
-"If you have one or more <application>Mageia</application> installations on "
-"your system, the installer will allow you to upgrade one of them to the "
-"latest release."
+"This can be used to upgrade an existing installation of <application>Mageia</"
+"application>."
 msgstr ""
-"若您在电脑上安装了多个 <application>Mageia</application>，安装程序将会允许您"
-"选择需要升级的系统。"
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
-#: en/selectInstallClass.xml:45
+#: en/selectInstallClass.xml:39
+#, fuzzy
 msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
-"thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do "
-"a clean install while preserving your <literal>/home</literal> partition."
+"thoroughly tested. If you want to upgrade a Mageia version that has reached "
+"its End Of Life, then it is better to do a clean install instead while "
+"preserving your <literal>/home</literal> partition."
 msgstr ""
 "我们只测试了从当前 <emphasis>尚被支持</emphasis>的发行版进行的升级过程。如果"
 "您希望从已经结束支持的 Mageia 版本升级到最新版本，我们建议您最好进行全新安"
 "装，同时保留您的 <literal>/home</literal> 分区。"
 
 #. type: Content of: <section><note><para>
-#: en/selectInstallClass.xml:56
+#: en/selectInstallClass.xml:50
+#, fuzzy
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
 "reboot, but please think twice before you do this. Once a partition has been "
 "formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you "
-"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
-"guilabel> simultaneously to reboot."
+"unusable system. If in spite of that, and only if you are very sure "
+"rebooting is what you want, go to a text terminal by pressing <guilabel>Alt "
+"Ctrl F2</guilabel> simultaneously. After that, press <guilabel>Alt Ctrl "
+"Delete</guilabel> simultaneously to reboot."
 msgstr ""
 "若安装过程在某一步中断，您可以选择重启，但请三思而后行。一旦分区被格式化，或"
 "升级过程开始，电脑中的内容将发生变化，此时重启可能导致系统无法使用。若您确定"
@@ -3803,12 +3939,14 @@ msgstr ""
 "<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
 
 #. type: Content of: <section><tip><para>
-#: en/selectInstallClass.xml:67
+#: en/selectInstallClass.xml:62
+#, fuzzy
 msgid ""
 "If you have discovered that you forgot to select an additional language, you "
-"can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
-"emphasis> do this later in the install."
+"can return from the <emphasis role=\"bold\">Install or Upgrade</emphasis> "
+"screen to the language choice screen by pressing <guilabel>Alt Ctrl Home</"
+"guilabel> simultaneously. <emphasis role=\"bold\">Do not</emphasis> do this "
+"later in the install."
 msgstr ""
 "若您忘记选择某一附加语言，您可以回到“安装或升级”界面，然后按下来 "
 "<guilabel>Alt Ctrl Home</guilabel> 并进行选择。请<emphasis>不要</emphasis>在"
@@ -3841,12 +3979,12 @@ msgstr ""
 "行选择。"
 
 #. type: Content of: <section><info><title>
-#: en/selectKeyboard.xml:14
+#: en/selectKeyboard.xml:7
 msgid "Keyboard"
 msgstr "键盘"
 
 #. type: Content of: <section><para>
-#: en/selectKeyboard.xml:17
+#: en/selectKeyboard.xml:10
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
@@ -3855,16 +3993,17 @@ msgstr ""
 "键盘。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectKeyboard.xml:22
+#: en/selectKeyboard.xml:15
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:30
+#: en/selectKeyboard.xml:22
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
 "If you don't know which layout your keyboard has, look in the specifications "
@@ -3879,43 +4018,46 @@ msgstr ""
 "Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:40
+#: en/selectKeyboard.xml:31
+#, fuzzy
 msgid ""
 "If your keyboard isn't in the list shown, click on <guibutton>More</"
-"guibutton> to get a full list, and select your keyboard there."
+"guibutton> to get a fuller list, and select your keyboard there."
 msgstr ""
 "若列表中没有您的键盘，请点击 <guibutton>更多</guibutton> 来查看完整列表，并选"
 "择相应的键盘种类。"
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
-#: en/selectKeyboard.xml:45
+#: en/selectKeyboard.xml:36
+#, fuzzy
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
 "you'll return to the first keyboard choice dialog and it will seem as though "
-"a keyboard from that screen was chosen. You can safely ignore this anomaly "
-"and continue the installation: Your keyboard is the one you chose from the "
-"full list."
+"a keyboard from that screen was chosen. You can safely ignore this and "
+"continue the installation: the keyboard chosen from the full list will be "
+"applied."
 msgstr ""
 "在点击 <guibutton>确定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX "
 "会应用您后来的选择。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectKeyboard.xml:55
+#: en/selectKeyboard.xml:46
+#, fuzzy
 msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
-"extra dialog screen asking how you would prefer to switch between the Latin "
-"and non-Latin keyboard layouts"
+"extra dialogue screen asking how you would prefer to switch between the "
+"Latin and non-Latin keyboard layouts"
 msgstr ""
 "若您选择了基于非拉丁字符的键盘布局，之后您将会看到有关切换拉丁/非拉丁键盘布局"
 "的提示窗口。"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:10
+#: en/selectLanguage.xml:15
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:12
+#: en/selectLanguage.xml:18
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3925,7 +4067,7 @@ msgstr ""
 "的安装过程中使用该语言。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:16
+#: en/selectLanguage.xml:23
 #, fuzzy
 msgid ""
 "Select your preferred language.  <application>Mageia</application> will use "
@@ -3935,18 +4077,19 @@ msgstr ""
 "的安装过程中使用该语言。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:19
+#: en/selectLanguage.xml:27
+#, fuzzy
 msgid ""
-"If it is likely that you will require several languages installed on your "
-"system, for yourself or other users, then you should use the "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
-"difficult to add extra language support after installation."
+"If it is likely that you (or others) will require several languages to be "
+"installed on your system, then you should use the <guibutton>Multiple "
+"languages</guibutton> option to add them now. It will be difficult to add "
+"extra language support after installation."
 msgstr ""
 "若您需要在系统中安装多种语言（为您和其他用户），请现在点击<guibutton>多语言</"
 "guibutton>按钮来添加语言。完成安装后添加额外语言是相对困难的。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:25
+#: en/selectLanguage.xml:33
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
@@ -3960,39 +4103,41 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:33
+#: en/selectLanguage.xml:43
+#, fuzzy
 msgid ""
-"Even if you choose more than one language, you must first choose one of them "
-"as your preferred language in the first language screen. It will also be "
-"marked as chosen in the multiple languages screen ."
+"Even if you choose more than one language, you must first choose one as your "
+"preferred language in the first language screen. It will also be marked as "
+"chosen in the multiple languages screen ."
 msgstr ""
 "如果您选择了多种语言，必须同时选择其中一种作为您的首选语言（在前一个语言选择"
 "界面中），该语言会同时出现在多语言配置界面中。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:50
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr "若您的键盘输入语言与首选语言不同，最好也同时安装该输入语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:44
+#: en/selectLanguage.xml:56
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia 默认使用 UTF-8（Unicode）格式。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:45
+#: en/selectLanguage.xml:58
+#, fuzzy
 msgid ""
-"This may be disabled in the \"multiple languages\" screen if you know that "
-"it is inappropriate for your language. Disabling UTF-8 applies to all "
-"installed languages."
+"This may be disabled in the <emphasis role=\"bold\">Multiple languages</"
+"emphasis> screen if you know that it is inappropriate for your language. "
+"Disabling UTF-8 applies to all installed languages."
 msgstr ""
 "若您认为这不适合您的语言，可以在“多语言”界面中将其禁用。该操作将应用到所有安"
 "装的语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:50
+#: en/selectLanguage.xml:64
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4043,68 +4188,73 @@ msgstr ""
 "过五键的鼠标。"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:6
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "添加或修改引导菜单项"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:9
+#: en/setupBootloaderAddEntry.xml:11
+#, fuzzy
 msgid ""
-"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
-"software grub-customizer instead (Available in the Mageia repositories)."
+"To do this you need to manually edit /boot/grub2/custom.cfg or use the "
+"software <emphasis role=\"bold\">grub-customizer</emphasis> tool instead "
+"(available in the Mageia repositories)."
 msgstr ""
 "为此，您需要手动编辑 /boot/grub2/custom.cfg，或者使用 grub-customizer（可以"
 "从 Mageia 仓库中安装）来编辑引导项。"
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:13
+#: en/setupBootloaderAddEntry.xml:16
+#, fuzzy
 msgid ""
-"For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
-"en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
-"link>"
+"For more information, see: <link ns2:href=\"https://wiki.mageia.org/en/Grub2-"
+"efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 msgstr ""
 "有关更多信息，请参考我们的 wiki：<link ns2:href=\"https://wiki.mageia.org/en/"
 "Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:9
+#: en/setupBootloader.xml:7
 msgid "Bootloader main options"
 msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:13
+#: en/setupBootloader.xml:10
 msgid "Bootloader interface"
 msgstr "引导器界面"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:15
+#: en/setupBootloader.xml:11
 msgid "By default, Mageia uses exclusively:"
 msgstr "默认情况下，Mageia 仅使用："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:14
+#, fuzzy
 msgid ""
-"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+"GRUB2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr "GRUB2（包含/不包含图形界面），当使用传统硬件 + MBR/GPT格式分区时"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:24
-msgid "Grub2-efi for a UEFI system."
+#: en/setupBootloader.xml:18
+#, fuzzy
+msgid "GRUB2-efi for a UEFI system."
 msgstr "GRUB2-efi，当使用 UEFI 硬件时。"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:22
 #, fuzzy
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia 的图形化菜单："
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:33
-msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+#: en/setupBootloader.xml:25
+#, fuzzy
+msgid "GRUB2 on Legacy/MBR and Legacy/GPT systems"
 msgstr "GRUB2，当使用传统硬件 + MBR/GPT 格式分区时"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:27
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4117,26 +4267,31 @@ msgstr ""
 "setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:45 en/setupBootloader.xml:73
+#: en/setupBootloader.xml:34 en/setupBootloader.xml:56
+#, fuzzy
 msgid ""
-"Don't modify the \"Boot Device\" unless you really know what you are doing."
+"Don't modify the <emphasis role=\"bold\">Boot Device</emphasis> unless you "
+"really know what you are doing."
 msgstr "若您不确定如何操作，请不要修改“引导设备”。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:50
-msgid "Grub2-efi on UEFI systems"
+#: en/setupBootloader.xml:38
+#, fuzzy
+msgid "GRUB2-efi on UEFI systems"
 msgstr "GRUB2-efi，当使用 UEFI 硬件时"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:52
+#: en/setupBootloader.xml:39
+#, fuzzy
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose between with or without graphical menu"
+"With a UEFI system, the user interface is slightly different as you cannot "
+"choose between the <emphasis role=\"bold\">with</emphasis> or <emphasis role="
+"\"bold\">without graphical menu</emphasis> options."
 msgstr ""
 "对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:42
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4149,14 +4304,15 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:49
+#, fuzzy
 msgid ""
 "If Mageia is the only system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"created an ESP (EFI System Partition) to house the bootloader (GRUB2-efi). "
 "If there are already UEFI operating systems installed on your computer "
 "(Windows 8 for example), the Mageia installer detects the existing ESP "
-"created by Windows and adds grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
+"created by Windows and adds GRUB2-efi. Although it is possible to have "
+"several ESPs, only one is required (and advised), whatever the number of "
 "operating systems you have."
 msgstr ""
 "如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系"
@@ -4166,41 +4322,46 @@ msgstr ""
 "求。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:79
+#: en/setupBootloader.xml:61
 msgid "Using a Mageia bootloader"
 msgstr "使用 Mageia 提供的引导器"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
-msgid "By default, according to your system, Mageia writes a new:"
+#: en/setupBootloader.xml:62
+#, fuzzy
+msgid ""
+"By default, and according to your system, Mageia writes one of the following:"
 msgstr "默认情况下，根据您的硬件情况，Mageia 会将："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:85
+#: en/setupBootloader.xml:66
+#, fuzzy
 msgid ""
-"GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard "
-"drive or in the BIOS boot partition."
+"a GRUB2 bootloader either into the MBR (Master Boot Record) of your first "
+"hard drive or in the BIOS boot partition."
 msgstr "GRUB 2 引导器安装至 MBR（主引导记录）区域或第一硬盘的 BIOS 引导分区。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:90
-msgid "Grub2-efi bootloader into the ESP"
+#: en/setupBootloader.xml:70
+#, fuzzy
+msgid "a GRUB2-efi bootloader into the ESP"
 msgstr "GRUB2-efi 引导器安装至 ESP"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:94
+#: en/setupBootloader.xml:73
+#, fuzzy
 msgid ""
 "If you already have other operating systems installed, Mageia attempts to "
 "add them to your new Mageia boot menu. If you don't want this behaviour, "
-"click on <guibutton>Next</guibutton> and then uncheck the box "
-"<guilabel>Probe Foreign OS</guilabel>"
+"click on <guibutton>Next</guibutton> and then untick the <emphasis role="
+"\"bold\">Probe Foreign OS </emphasis>option"
 msgstr ""
 "若您已安装了其他操作系统，Mageia 会尝试将它们也添加到 Mageia 的引导菜单。如果"
 "您不希望 Mageia 这么做，请点击<guibutton>下一步</guibutton>，然后取消勾选"
 "<guilabel>检测其他操作系统</guilabel>"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:78
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
@@ -4214,41 +4375,43 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:87
 msgid "Using an existing bootloader"
 msgstr "使用现存的引导器"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:113
+#: en/setupBootloader.xml:88
+#, fuzzy
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
-"is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and "
-"add it automatically. See the documentation for the operating system in "
-"question."
+"is beyond the scope of this documentation, however in most cases it will "
+"involve running the relevant bootloader installation program which should "
+"detect and add it automatically. See the documentation for the operating "
+"system in question."
 msgstr ""
 "有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计"
 "到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档"
 "以便进一步操作。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:121
+#: en/setupBootloader.xml:95
 msgid "Using chain loading"
 msgstr "使用链式加载（chain loading）"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:123
+#: en/setupBootloader.xml:96
+#, fuzzy
 msgid ""
-"If you don't want a bootable Mageia, but to chain load it from another OS, "
+"If you don't want a bootable Mageia, but to chain-load it from another OS, "
 "click on <guibutton>Next</guibutton>, then on <guibutton>Advanced</"
-"guibutton> and Check the box <guilabel>Do not touch ESP or MBR</guilabel>."
+"guibutton> and tick the box <guilabel>Do not touch ESP or MBR</guilabel>."
 msgstr ""
 "若您不需要 Mageia 安装引导器，而是希望从其他系统引导 Mageia，请点击"
 "<guibutton>下一步</guibutton>，然后点击<guibutton>高级</guibutton>并勾选 "
 "<guilabel>不要修改 ESP 或 MBR</guilabel>。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:129
+#: en/setupBootloader.xml:101
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -4261,7 +4424,7 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:138
+#: en/setupBootloader.xml:108
 msgid ""
 "You will get a warning that the bootloader is missing, ignore it by clicking "
 "<guibutton>OK</guibutton>."
@@ -4269,7 +4432,7 @@ msgstr ""
 "安装程序将会提醒您缺少引导器，请忽略它并点击<guibutton>确定</guibutton>。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:142
+#: en/setupBootloader.xml:111
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-setupBootloader5.png\"/> </"
@@ -4279,113 +4442,115 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloader.xml:149
+#: en/setupBootloader.xml:117
 msgid "Options"
 msgstr "选项"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:152
+#: en/setupBootloader.xml:119
 msgid "First page"
 msgstr "第一页"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:156
+#: en/setupBootloader.xml:120
+#, fuzzy
 msgid ""
-"<guilabel>Delay before booting the default image</guilabel>: This text box "
-"lets you set a delay in seconds before the default operating system is "
-"started up."
+"<guilabel>Delay before booting the default image</guilabel>: This lets you "
+"set a delay in seconds before the default operating system is started up."
 msgstr ""
 "<guilabel>自动引导之前等待</guilabel>：此文本框用于设置在等待多少秒之后自动进"
 "入默认选定的操作系统。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:162
+#: en/setupBootloader.xml:122
 #, fuzzy
 msgid ""
 "<guilabel>Security</guilabel>: This allows you to set a password for the "
-"bootloader. This means a username and password will be asked at the boot "
-"time to select a booting entry or change settings. The username is \"root\" "
-"and the password is the one chosen here after."
+"bootloader. This means a username and password will be required when booting "
+"to select a booting entry or change settings. The username is <emphasis role="
+"\"bold\">root</emphasis> and the password is the one chosen here-after."
 msgstr ""
 "<guilabel>安全</guilabel>：用于设置引导器的密码。可以防止其他人进入单用户模"
 "式，或者修改引导参数。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:170
-msgid ""
-"<guilabel>Password</guilabel>: This text box is where you actually put the "
-"password"
+#: en/setupBootloader.xml:125
+#, fuzzy
+msgid "<guilabel>Password</guilabel>: Choose a password for the bootloader."
 msgstr "<guilabel>密码</guilabel>：此文本框用于输入密码"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:175
+#: en/setupBootloader.xml:126
+#, fuzzy
 msgid ""
-"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
-"check that it matches with the one set above."
+"<guilabel>Password (again)</guilabel>: Retype the password and DrakX will "
+"check that it matches with the one above."
 msgstr ""
 "<guilabel>确认密码</guilabel>：再次输入密码，安装程序将检查您两次输入的密码是"
 "否一致。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:181 en/setupBootloader.xml:239
+#: en/setupBootloader.xml:127 en/setupBootloader.xml:159
 msgid "<guilabel>Advanced</guilabel>"
 msgstr "<guilabel>高级</guilabel>"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:185
+#: en/setupBootloader.xml:127
+#, fuzzy
 msgid ""
 "<guilabel>Enable ACPI:</guilabel> ACPI (Advanced Configuration and Power "
-"Interface) is a standard for the power management. It can save energy by "
-"stopping unused devices, this was the method used before APM. Unchecking it "
-"could be useful if, for example, your computer does not support ACPI or if "
-"you think the ACPI implementation might cause some problems (for instance "
-"random reboots or system lockups)."
+"Interface) is a standard for power management. It can save energy by "
+"stopping unused devices.  Deselecting it could be useful if, for example, "
+"your computer does not support ACPI or if you think the ACPI implementation "
+"might cause some problems (for instance random reboots or system lockups)."
 msgstr ""
 "ACPI（高级配置与电源接口）是标准的电源管理协议。它可以关闭未使用的设备以节"
 "能，用于取代 APM。如果您的硬件不兼容 ACPI，或者您认为 ACPI 会造成某些问题（如"
 "偶尔会自动重启，或系统卡死），则可以取消勾选它。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:195
+#: en/setupBootloader.xml:133
+#, fuzzy
 msgid ""
-"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"<guilabel>Enable SMP</guilabel>: This option enables/disables symmetric "
 "multiprocessing for multi core processors."
 msgstr ""
 "<guilabel>启用 SMP</guilabel>：此选项启用或禁用多核处理器上的对称多处理器特"
 "性。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:201
+#: en/setupBootloader.xml:135
+#, fuzzy
 msgid ""
-"<guilabel>Enable APIC</guilabel>: Enabling or disabling this gives the "
-"operating system access to the Advanced Programmable Interrupt Controller. "
-"APIC devices permit more complex priority models, and Advanced IRQ "
-"(Interrupt Request)  management."
+"<guilabel>Enable APIC</guilabel>: This gives the operating system access to "
+"the Advanced Programmable Interrupt Controller. APIC devices permit more "
+"complex priority models, and Advanced IRQ (Interrupt Request) management."
 msgstr ""
 "<guilabel>启用 APIC</guilabel>：启用或禁用高级可编程中断控制器。APIC 设备可以"
 "支持更复杂的优先级模型和高级 IRQ（中断请求）管理功能。"
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:209
+#: en/setupBootloader.xml:138
+#, fuzzy
 msgid ""
-"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
-"manages all external interrupts for a specific processor in an SMP system."
+"<guilabel>Enable Local APIC</guilabel>: Local APIC manages all external "
+"interrupts for a specific processor in an SMP system."
 msgstr ""
 "<guilabel>启用本地 APIC</guilabel>：您可以在这里设置本地 APIC，用于在 SMP 系"
 "统中管理某个特定处理器的所有外部中断。"
 
 #. type: Content of: <section><section><section><title>
-#: en/setupBootloader.xml:219
+#: en/setupBootloader.xml:143
 msgid "Next page"
 msgstr "下一页"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:223
+#: en/setupBootloader.xml:146
 msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr "<guilabel>默认</guilabel>：使用默认引导参数"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:228
+#: en/setupBootloader.xml:150
 msgid ""
 "<guilabel>Append:</guilabel> This option lets you pass the kernel "
 "information or tell the kernel to give you more information as it boots."
@@ -4393,7 +4558,7 @@ msgstr ""
 "<guilabel>追加</guilabel> ：用于在默认引导选项后添加额外所需的内核参数。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:234
+#: en/setupBootloader.xml:155
 msgid ""
 "<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
@@ -4402,17 +4567,18 @@ msgstr ""
 "\">使用 Mageia 引导器</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:241
+#: en/setupBootloader.xml:159
+#, fuzzy
 msgid ""
 "<guilabel>Video mode:</guilabel> This sets the screen size and colour depth "
-"the boot menu will use. If you click the down triangle you will be offered "
-"other size and colour depth options."
+"to be used by the boot menu. If you click the down triangle you will be "
+"offered other size and colour depth options."
 msgstr ""
 "<guilabel>图像模式</guilabel>：用于设定显示引导菜单时的屏幕分辨率和色彩深度。"
 "若要从可用的模式中进行选择，请点击下三角标记。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
-#: en/setupBootloader.xml:248
+#: en/setupBootloader.xml:162
 msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
@@ -4421,7 +4587,7 @@ msgstr ""
 "\"setupChainLoading\">使用链式加载</link>"
 
 #. type: Content of: <section><info><title>
-#: en/setupSCSI.xml:11
+#: en/setupSCSI.xml:3
 msgid "Setup SCSI"
 msgstr "设置SCSI"
 
@@ -4434,33 +4600,36 @@ msgstr "设置SCSI"
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
 #.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
-#: en/setupSCSI.xml:26
+#: en/setupSCSI.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-setupSCSI.png\" align="
+"\"center\" xml:id=\"setupSCSI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
-"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:32
+#: en/setupSCSI.xml:27
+#, fuzzy
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers "
-"it may be unable to determine the correct drivers to use and subsequently "
-"fail to recognise the drive."
+"DrakX will normally detect hard disks correctly. However, with some older "
+"SCSI controllers it may be unable to determine the correct drivers to use "
+"and subsequently fail to recognise the drive."
 msgstr ""
 "Drakx 通常会正确探测硬盘。对于一些较老的 SCSI 控制器，Drakx 可能无法确定所需"
 "的驱动，并因此无法识别它们。"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:36
+#: en/setupSCSI.xml:32
+#, fuzzy
 msgid ""
-"If this happens, you will need to manually tell Drakx which SCSI drive(s) "
+"If this happens, you will need to manually tell DrakX which SCSI drive(s) "
 "you have."
 msgstr "在这种情况下，您需要手动设置 DrakX 应当使用的 SCSI 驱动。"
 
 #. type: Content of: <section><para>
-#: en/setupSCSI.xml:39
+#: en/setupSCSI.xml:35
 msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "随后 DrakX 应当能正确配置这些驱动器。"
 
@@ -4481,10 +4650,10 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:14
+#, fuzzy
 msgid ""
 "In this screen the name of the driver that the installer chose for your "
-"sound card is given, which will be the default driver if we have a default "
-"one."
+"sound card is given, which will be the default driver if one exists."
 msgstr ""
 "这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
 
@@ -4503,40 +4672,45 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:24
+#, fuzzy
 msgid ""
-"Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
-"guibutton> to find very useful advice about how to solve the problem."
+"Then, in the <emphasis role=\"bold\">draksound</emphasis> or <emphasis role="
+"\"bold\">Sound Configuration</emphasis> tool screen, click on "
+"<guibutton>Troubleshooting</guibutton> to find useful advice about how to "
+"solve the problem."
 msgstr ""
 "在 draksound 或“声音配置”工具界面，点击<guibutton>高级</guibutton>、"
 "<guibutton>故障排除</guibutton>来查看解决问题的建议。"
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:31
+#: en/soundConfig.xml:30
 msgid "Advanced"
 msgstr "高级"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:34
+#: en/soundConfig.xml:33
+#, fuzzy
 msgid ""
-"Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
-"useful if there is no default driver and there are several drivers "
-"available, but you think the installer selected the wrong one."
+"Clicking <emphasis role=\"bold\"><guibutton>Advanced</guibutton></emphasis> "
+"in this screen, during install, is useful if there is no default driver and "
+"there are several drivers available, but you think the installer selected "
+"the wrong one."
 msgstr ""
 "若没有默认驱动，或者默认驱动选择错误，则可以安装时点击此界面中的"
 "<guibutton>Advanced</guibutton>来更正。"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:39
+#: en/soundConfig.xml:38
+#, fuzzy
 msgid ""
-"In that case you can select a different driver after clicking on "
-"<guibutton>Let me pick any driver</guibutton>."
+"In that case you can select a different driver after clicking on <emphasis "
+"role=\"bold\"><guibutton>Let me pick any driver</guibutton></emphasis>."
 msgstr ""
 "`在这种情况下，您可以在点击<guibutton>让我选择任意驱动</guibutton>来选择其他"
 "驱动程序。"
 
 #. type: Content of: <section><info><title>
-#: en/takeOverHdConfirm.xml:4
+#: en/takeOverHdConfirm.xml:3
 msgid "Confirm hard disk to be formatted"
 msgstr "确定要格式化的硬盘"
 
@@ -4547,13 +4721,13 @@ msgstr "确定要格式化的硬盘"
 #.     saw this help screen when I had only one HD 
 #.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
-#: en/takeOverHdConfirm.xml:19
+#: en/takeOverHdConfirm.xml:18
+#, fuzzy
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
-"imageobject>"
+"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject> <imageobject "
+"condition=\"classical\"> <imagedata format=\"PNG\" fileref=\"dx2-"
+"takeOverHdConfirm.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
 "png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
@@ -4563,16 +4737,19 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
+#, fuzzy
 msgid ""
-"Click on <guibutton>Previous</guibutton> if you are not sure about your "
+"Click on <guibutton>Previous</guibutton> if you are at all unsure about your "
 "choice."
 msgstr "若您不确定选择是否正确，请点击 <guibutton>上一步</guibutton>。"
 
 #. type: Content of: <section><para>
-#: en/takeOverHdConfirm.xml:30
+#: en/takeOverHdConfirm.xml:31
+#, fuzzy
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
-"partition, every operating system and all data on that hard disk."
+"Click on <guibutton>Next</guibutton> to proceed if you are sure that it is "
+"ok to erase every partition, every operating system and all data that might "
+"be on that hard disk."
 msgstr ""
 "如果您确定要删除所有分区和所有操作系统（及数据），请点击 <guibutton>下一步</"
 "guibutton>。"
@@ -4690,42 +4867,40 @@ msgstr ""
 msgid "Uninstalling Mageia"
 msgstr "卸载Mageia"
 
-#. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:10
-msgid "Howto"
-msgstr "如何做"
-
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:12
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:9
+#, fuzzy
 msgid ""
-"If Mageia didn't convince you or you can't install it correctly, in short "
-"you want get rid of it. That is your right and Mageia also gives you the "
+"If Mageia didn't convince you or you can't install it correctly - in short "
+"you want get rid of it - that is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
 msgstr ""
 "若 Mageia 未能给您提供良好体验，或您未能正确安装系统，Mageia 允许您卸载它。这"
 "一功能可不是所有操作系统都会提供的！"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:17
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:14
+#, fuzzy
 msgid ""
-"After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
-"only have Windows with no option to choose your operating system."
+"After your data backup, reboot your Mageia installation DVD and select "
+"<emphasis role=\"bold\">Rescue system</emphasis>, then, <emphasis role=\"bold"
+"\">Restore Windows boot loader</emphasis>. At the next boot, you will only "
+"have Windows, with no option to choose your operating system."
 msgstr ""
 "在备份您的数据后，请用 Mageia 安装 DVD 重新引导系统，并进入救援系统，选择恢"
 "复 Windows 引导器（Restore Windows boot loader）。再次重启后，您将只能进入 "
 "Windows 系统。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:22
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:19
+#, fuzzy
 msgid ""
-"To recover the space used by Mageia partitions on Windows, click on "
+"In Windows to recover the space used by Mageia partitions: click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
-"> Storage -> Disk Management</code> to access to the partition management. "
-"You will recognize the Mageia partition because they are labeled "
-"<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select <guibutton>Delete</"
-"guibutton>. The space will be freed."
+"> Storage -> Disk Management</code>. You will recognize a Mageia partition "
+"because they are labeled <guilabel>Unknown</guilabel>, and also by their "
+"size and place on the disk. Right click on each of these partitions and "
+"select <guibutton>Delete</guibutton> to free up the space."
 msgstr ""
 "若要将被 Mageia 使用的空间重新用于 Windows，请点击 <code>开始 -> 控制面包 -> "
 "管理工具 -> 计算机管理 -> 存储 -> 磁盘管理</code>。拥有 <guilabel>未知</"
@@ -4733,8 +4908,8 @@ msgstr ""
 "右键点击这些分区，并选择 <guibutton>删除</guibutton>，即可释放这些分区占用的"
 "空间。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:30
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:27
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
@@ -4742,14 +4917,15 @@ msgstr ""
 "若您安装了 Windows XP，您可以使用空闲空间创建一个新分区并格式化它（FAT32 或 "
 "NTFS），系统将自动为其分配一个盘符。"
 
-#. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:33
+#. type: Content of: <section><para>
+#: en/uninstall-Mageia.xml:30
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left of the freed space.  There are other "
-"partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and "
-"make sure all important things have been backed up."
+"existing partition that is at the left of the freed space. There are other "
+"partitioning tools that can be used, such as <emphasis role=\"bold"
+"\">gparted</emphasis>, available for both Windows and Linux. As always, when "
+"changing partitions, be very careful to back up anything important to you."
 msgstr ""
 "若您同时安装了 Windows Vista 或 Windows 7，您还可以扩展现存分区的大小。您也可"
 "以使用其他分区工具，如 gparted（Windows 和 Linux 下均由对应版本）。记住：在调"
@@ -4799,6 +4975,314 @@ msgstr ""
 "间，这是正常现象。"
 
 #~ msgid ""
+#~ "<guilabel>Password (again)</guilabel>: Retype the user password into this "
+#~ "text box and drakx will check you have the same password in each of the "
+#~ "user password text boxes."
+#~ msgstr ""
+#~ "<guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次"
+#~ "输入的密码是否一致。"
+
+#~ msgid "Additionally, you can disable or enable a guest account."
+#~ msgstr "此外，您还可以禁用或启用来宾账户。"
+
+#~ msgid ""
+#~ "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
+#~ "saves to his /home directory will be erased when he logs out.  The guest "
+#~ "should save his important files to a USB key."
+#~ msgstr ""
+#~ "任何使用<emphasis>rbash</emphasis>来宾账户创建的文件将会在注销后被删除。来"
+#~ "宾应当将他/她的临时文件存储于 U 盘等设备中。"
+
+#~ msgid ""
+#~ "<guilabel>Enable guest account</guilabel>: Here you can enable or disable "
+#~ "a guest account. The guest account allows a guest to log into and use the "
+#~ "PC, but he has more restricted access than normal users."
+#~ msgstr ""
+#~ "<guilabel>启用来宾账户</guilabel>：这里您可以启用或禁用来宾账户。来宾账户"
+#~ "允许来宾登录并使用电脑，但对其使用更严格的访问权限控制。"
+
+#~ msgid ""
+#~ "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
+#~ "number, usually the same one as for the user. Leave it blank unless you "
+#~ "know what you are doing."
+#~ msgstr ""
+#~ "<guilabel>组 ID</guilabel>：这里您可以设置之前所添加的用户的 组 ID（数值，"
+#~ "一般与用户 ID 相同）。若您不确定如何设置，请将其留空。"
+
+#~ msgid ""
+#~ "\"Device\", is made up of: \"hard drive\", [\"hard drive number"
+#~ "\"(letter)], \"partition number\" (for example, \"sda5\")."
+#~ msgstr ""
+#~ "“设备名”包括：“硬盘驱动器”，[“硬盘驱动器编号”（由字母表示）]，“分区编号”。"
+#~ "例如，“sda5”表示第一个 SCSI 设备上的第五个分区。"
+
+#~ msgid "Workstation."
+#~ msgstr "工作区"
+
+#~ msgid "Server."
+#~ msgstr "服务器。"
+
+#~ msgid "Graphical Environment."
+#~ msgstr "图形界面环境"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+#~ "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "There are four groups, click on the triangle before a group to expand it "
+#~ "and see all services in it."
+#~ msgstr "单击各组前的三角形图标可以展开该组中的服务。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+#~ "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
+#~ "format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you cannot find your card in the vendor lists (because it's not yet in "
+#~ "the database or it's an older card) you may find a suitable driver in the "
+#~ "Xorg category"
+#~ msgstr ""
+#~ "若您找不到所需的制造商列表（如显卡太老，或尚未加入到数据库中），您也可以"
+#~ "在 Xorg 目录中找到合适的驱动"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser."
+#~ "png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> "
+#~ "</imagedata> </imageobject>"
+#~ 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>"
+
+#~ 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 ""
+#~ "每个硬盘及其他存储设备（如 U 盘）都在对应的标签页中显示。例如，在三个标签"
+#~ "页中分别显示 sda、sdb、sdc 的磁盘布局。"
+
+#, 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-"
+#~ "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid ""
+#~ "The installer will share the available place out according to the "
+#~ "following rules:"
+#~ msgstr "安装程序将会根据下列规则使用可用空间："
+
+#~ msgid "\"Align to\" \"MiB\""
+#~ msgstr "“对齐到”“MiB”"
+
+#~ msgid "\"Free space preceding (MiB)\" \"2\""
+#~ msgstr "“前面的自由空间（MiB）”“2”"
+
+#, fuzzy
+#~ msgid "From this screen, it is possible to set some personal preferences:"
+#~ msgstr "在此页中，可以进行自定义设置："
+
+#~ msgid ""
+#~ "The language (for the installation only, may be different that the chosen "
+#~ "language for the system) by pressing the key F2 (Legacy mode only)"
+#~ msgstr ""
+#~ "按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
+
+#~ msgid ""
+#~ "Here is for example, the French welcome screen when using a Live DVD/CD. "
+#~ "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+#~ "guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
+#~ "Detection Tool</guilabel>."
+#~ msgstr ""
+#~ "此处给出了使用 Live DVD/CD 安装时法语版的欢迎界面。注意，Live DVD/CD 菜单"
+#~ "中不包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> "
+#~ "and <guilabel>硬件检测工具</guilabel>。"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
+#~ "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
+#~ "emphasis> key for the UEFI mode."
+#~ msgstr ""
+#~ "按 <emphasis role=\"bold\">F6</emphasis> 键（传统模式下）或 <emphasis "
+#~ "role=\"bold\">e</emphasis> 键（UEFI 模式下）可以添加内核参数。"
+
+#~ msgid ""
+#~ "If the installation fails, then it may be necessary to try again using "
+#~ "one of the extra options. The menu called by F6 displays a new line "
+#~ "called <guilabel>Boot options</guilabel> and propose four entries:"
+#~ msgstr ""
+#~ "若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项"
+#~ "</guilabel>，这里提供了四个选项："
+
+#~ msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
+#~ msgstr "按 F1 键可以添加更多内核参数（仅用于传统模式）。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Here is the default welcome screen when using a Wired Network-based "
+#~ "Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
+#~ msgstr ""
+#~ "此处是使用有线网络安装 CD（Boot.iso 或 Boot-Nonfree.iso 镜像）安装时的默认"
+#~ "欢迎界面："
+
+#~ msgid ""
+#~ "It does not allow to change the language, the available options are "
+#~ "described in the screen. For more information about using a Wired Network-"
+#~ "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/"
+#~ "Boot.iso_install\">the Mageia Wiki</link>"
+#~ msgstr ""
+#~ "此处无法改变语言，界面中列出了可用的选项。有关使用有线网络安装 CD 来安装的"
+#~ "更多细节，请参考 <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+#~ "iso_install\">Mageia Wiki</link>。"
+
+#~ msgid "The keyboard layout is the American one."
+#~ msgstr "键盘布局为美式键盘。"
+
+#, fuzzy
+#~ msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png"
+#~ "\" format=\"PNG\" align=\"center\" xml:id=\"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 ""
+#~ "If selected, \"With X\" will also include IceWM as lightweight desktop "
+#~ "environment."
+#~ msgstr "若选中“包含 X”，将会同时选定 IceWM 作为轻量级的桌面环境。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png"
+#~ "\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></"
+#~ "imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid "You can adjust your security level here."
+#~ msgstr "您可以在这里调整安全等级。"
+
+#~ msgid ""
+#~ "Leave the default settings as they are, if you don't know what to choose."
+#~ msgstr "若您不确定如何选择，请使用默认设置。"
+
+#~ msgid ""
+#~ "LIVE media: you can boot the media in a real Mageia system without "
+#~ "installing it, to see what you will get after installation.  The "
+#~ "installation process is simpler, but you get lesser choices."
+#~ msgstr ""
+#~ "Live 媒介：您无需实际安装即可实际体验 Mageia 系统，以便确定系统被安装之后"
+#~ "的模样。这种安装的过程更加简单，但您可做的选择也相应减少。"
+
+#~ msgid "Boot-only CD media"
+#~ msgstr "仅用于引导的 CD"
+
+#~ msgid "Check the radio button Save File."
+#~ msgstr "点击“保存文件”选项。"
+
+#~ msgid "You can also use the dd tool in a console:"
+#~ msgstr "您也可以在终端中使用 dd 工具："
+
+#~ msgid "Unplug your USB stick, it is done"
+#~ msgstr "操作完成，拔下 U 盘"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+#~ "\"center\" format=\"PNG\"></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "Use this option for a fresh <application>Mageia</application> "
+#~ "installation."
+#~ msgstr "使用此选项来进行全新 <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."
+#~ msgstr ""
+#~ "若您在电脑上安装了多个 <application>Mageia</application>，安装程序将会允许"
+#~ "您选择需要升级的系统。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
+#~ "format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid "Howto"
+#~ msgstr "如何做"
+
+#~ msgid ""
 #~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 #~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
 #~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
@@ -4812,9 +5296,6 @@ msgstr ""
 #~ msgid "Custom"
 #~ msgstr "自定义"
 
-#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
-#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
 #~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
@@ -4825,18 +5306,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
-#~ "- Safe Settings, priority is given to the safer options to the detriment "
-#~ "of performances."
-#~ msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 #~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 #~ msgstr ""
diff --git a/docs/docs/stable/mcc-help/ca.po b/docs/docs/stable/mcc-help/ca.po
index 1b8e1456..34c0f201 100644
--- a/docs/docs/stable/mcc-help/ca.po
+++ b/docs/docs/stable/mcc-help/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-02-10 09:47+0200\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-23 15:27+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -64,7 +64,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -3912,7 +3912,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Entrades del menú"
 
@@ -3927,7 +3927,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3942,7 +3942,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3953,7 +3953,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4347,22 +4347,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4372,12 +4372,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
@@ -4387,19 +4387,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4407,97 +4407,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4505,22 +4505,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4530,7 +4530,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4538,22 +4538,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4562,57 +4562,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4620,17 +4620,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/cs.po b/docs/docs/stable/mcc-help/cs.po
index acbb01ae..292b1138 100644
--- a/docs/docs/stable/mcc-help/cs.po
+++ b/docs/docs/stable/mcc-help/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-11 13:01+0000\n"
 "Last-Translator: Luděk Janča <joelp@email.cz>\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -60,7 +60,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -236,8 +236,8 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "cs"
 
@@ -3544,7 +3544,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr ""
 
@@ -3559,7 +3559,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3574,7 +3574,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3585,7 +3585,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -3979,22 +3979,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Sdílení adresářů a jednotek s pomocí Samby"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4009,35 +4009,34 @@ msgstr ""
 "operačním systémem lze přistupovat k prostředkům na Samba serveru."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Příprava"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4045,97 +4044,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4143,22 +4142,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4168,7 +4167,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4176,22 +4175,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4200,57 +4199,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4258,17 +4257,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/da.po b/docs/docs/stable/mcc-help/da.po
index 19b0e263..b1bc44ba 100644
--- a/docs/docs/stable/mcc-help/da.po
+++ b/docs/docs/stable/mcc-help/da.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: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-04-16 20:06+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -52,7 +52,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -224,8 +224,8 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "da"
 
@@ -3525,7 +3525,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr ""
 
@@ -3540,7 +3540,7 @@ msgid "draknfs5.png"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3555,7 +3555,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3566,7 +3566,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -3960,22 +3960,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -3985,35 +3985,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4021,97 +4020,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4119,22 +4118,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4144,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4152,22 +4151,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4176,57 +4175,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr ""
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4234,17 +4233,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/de.po b/docs/docs/stable/mcc-help/de.po
index f9ec812d..20d5e884 100644
--- a/docs/docs/stable/mcc-help/de.po
+++ b/docs/docs/stable/mcc-help/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: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-05 15:44+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -71,7 +71,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -311,8 +311,8 @@ msgstr ""
 "dies nicht mit jedem Dateimanager möglich."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "de"
 
@@ -4498,7 +4498,7 @@ msgstr ""
 "der Man-Page exports(5) entnommen werden."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menüeinträge"
 
@@ -4513,7 +4513,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Datei|Schreibe conf"
 
@@ -4528,7 +4528,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS-Server|Neu starten"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4541,7 +4541,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS-Server|Neu laden"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -5059,22 +5059,22 @@ msgstr ""
 "\">Mageia Wiki Seite</link> nach."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Laufwerke und Verzeichnisse mit Samba freigeben"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -5090,35 +5090,34 @@ msgstr ""
 "des Samba-Servers zugreifen."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Vorbereitung"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Damit andere Computer auf den Server zugreifen können, muss der Server eine "
 "feste IP-Adresse besitzen. Dies kann direkt auf dem Server, z. B. mit <xref "
-"linkend=\"draknetcenter\"/>, oder auf dem DHCP-Server eingestellt "
-"werden. Der DHCP-Server ist nämlich in der Lage, einen Computer anhand "
-"seiner MAC-Adresse zu identifizieren und ihm immer die gleiche IP-Adresse "
-"zuzuweisen. Die Firewall des Server-Rechners muss außerdem so eingestellt "
-"werden, dass ankommende Anfragen zum Samba-Server akzeptiert werden."
+"linkend=\"draknetcenter\"/>, oder auf dem DHCP-Server eingestellt werden. "
+"Der DHCP-Server ist nämlich in der Lage, einen Computer anhand seiner MAC-"
+"Adresse zu identifizieren und ihm immer die gleiche IP-Adresse zuzuweisen. "
+"Die Firewall des Server-Rechners muss außerdem so eingestellt werden, dass "
+"ankommende Anfragen zum Samba-Server akzeptiert werden."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Einrichtungsassistent - Standalone-Server"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5127,7 +5126,7 @@ msgstr ""
 "role=\"bold\">draksambashare</emphasis> als root eingeben."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5140,24 +5139,24 @@ msgstr ""
 "Servers gestartet."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "Im nächsten Fenster ist bereits die Option \"Standalone\" ausgewählt."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5166,7 +5165,7 @@ msgstr ""
 "Server zugreifen möchten, sollten sich in der selben Arbeitsgruppe befinden."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5174,17 +5173,17 @@ msgstr ""
 "Der Netbios-Name wird im Netzwerk als Bezeichner für den Server verwendet."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Wählen Sie den Sicherheitsmodus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5193,7 +5192,7 @@ msgstr ""
 "die Freigabe zugreifen zu können."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5202,7 +5201,7 @@ msgstr ""
 "Freigabe getrennt."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5211,12 +5210,12 @@ msgstr ""
 "Freigabe zugreifen dürfen."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5225,12 +5224,12 @@ msgstr ""
 "Computern angezeigt wird, wenn sie den Server sehen."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5238,12 +5237,12 @@ msgstr ""
 "nächsten Schritt festgelegt werden."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5254,22 +5253,22 @@ msgstr ""
 "anschließend unter <code>/etc/samba/smb.conf</code> geschrieben."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Einrichtungsassistent - Primärer Domänencontroller"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5284,7 +5283,7 @@ msgstr ""
 "Servers, außer dass Sie den Sicherheits-Modus wählen können:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5296,22 +5295,22 @@ msgstr ""
 "(Sicherheits-)Controllern geteilt."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Ein Verzeichnis zur gemeinsamen Nutzung freigeben"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Mit der <guibutton>Hinzufügen</guibutton> Schaltfläche erhalten wir:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5325,61 +5324,61 @@ msgstr ""
 "werden."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Wenn die Liste mindestens einen Eintrag enthält können folgende Menüeinträge "
 "verwendet werden."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 "Speichert die aktuelle Konfiguration in <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba-Server|Konfigurieren"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Der Assistent kann mit diesem Befehl erneut ausgeführt werden."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba-Server|Neu starten"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba-Server|Neu laden"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Druckerfreigabe"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 "Samba ermöglicht Ihnen auch Drucker für die gemeinsame Nutzung freizugeben."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5387,17 +5386,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba-Benutzer"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/el.po b/docs/docs/stable/mcc-help/el.po
index 2ec139c2..c76e514c 100644
--- a/docs/docs/stable/mcc-help/el.po
+++ b/docs/docs/stable/mcc-help/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-01 18:47+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -299,8 +299,8 @@ msgstr ""
 "του."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "el"
 
@@ -4475,7 +4475,7 @@ msgstr ""
 "εγχειριδίου exports(5) για περισσότερες λεπτομέρειες."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Καταχωρήσεις μενού"
 
@@ -4490,7 +4490,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Αρχείο | Εγγραφή της διαμόρφωσης"
 
@@ -4505,7 +4505,7 @@ msgid "NFS Server|Restart"
 msgstr "Εξυπηρετητής NFS | Επανεκκίνηση"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4518,7 +4518,7 @@ msgid "NFS Server|Reload"
 msgstr "Εξυπηρετητής NFS | Επαναφόρτωση"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -5043,22 +5043,22 @@ msgstr ""
 "wiki</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Κοινόχρηστοι κατάλογοι και οδηγοί με Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -5075,19 +5075,18 @@ msgstr ""
 "Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Προετοιμασία"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Για να είναι προσπελάσιμο από άλλους σταθμούς εργασίας, ο διακομιστής πρέπει "
 "να έχει μια σταθερή διεύθυνση IP. Αυτή μπορεί να καθοριστεί απευθείας στον "
@@ -5097,12 +5096,12 @@ msgstr ""
 "θα πρέπει να επιτρέπει τις εισερχόμενες αιτήσεις στον διακομιστή Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Οδηγός - Αυτόνομος διακομιστής"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5112,7 +5111,7 @@ msgstr ""
 "διαχειριστής συστήματος."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5124,12 +5123,12 @@ msgstr ""
 "οδηγός διαμόρφωσης του εξυπηρετητή Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5137,12 +5136,12 @@ msgstr ""
 "Στο επόμενο παράθυρο έχει προεπιλεγεί η διαμόρφωση του Αυτόνομου διακομιστή."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5151,7 +5150,7 @@ msgstr ""
 "είναι το ίδιο για την προσπέλαση των κοινόχρηστων πόρων."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5160,17 +5159,17 @@ msgstr ""
 "εξυπηρετητή στο δίκτυο."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Επιλέξτε την λειτουργία ασφαλείας:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5179,7 +5178,7 @@ msgstr ""
 "για την προσπέλαση του πόρου."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5188,7 +5187,7 @@ msgstr ""
 "για κάθε πόρο."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5197,12 +5196,12 @@ msgstr ""
 "πόρους, βάσει της διεύθυνσης IP ή του ονόματος υπολογιστή."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5212,12 +5211,12 @@ msgstr ""
 "Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5225,12 +5224,12 @@ msgstr ""
 "επόμενο βήμα."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5241,22 +5240,22 @@ msgstr ""
 "<code>/etc/samba/smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Οδηγός - Πρωτεύων ελεγκτής τομέα"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5271,7 +5270,7 @@ msgstr ""
 "μπορείτε να επιλέξετε τη λειτουργία ασφαλείας:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5283,22 +5282,22 @@ msgstr ""
 "ανάμεσα στους ελεγκτές (ασφαλείας) του τομέα."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Δηλώστε έναν κατάλογο για κοινοχρησία"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Με το κουμπί <guibutton>Προσθήκη</guibutton>, επιτυγχάνουμε:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5312,60 +5311,60 @@ msgstr ""
 "μετονομαστεί."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Όταν η λίστα περιέχει τουλάχιστον μια καταχώρηση θα μπορούν να "
 "χρησιμοποιηθούν και οι καταχωρήσεις."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 "Αποθήκευση της τρέχουσας διαμόρφωσης στο <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Διακομιστής Samba | Διαμόρφωση"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Ο οδηγός μπορεί να εκτελεστεί εκ νέου με αυτήν την εντολή."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Εξυπηρετητής  Samba | Επανεκκίνηση"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Εξυπηρετητής Samba | Επαναφόρτωση"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Κοινή χρήση εκτυπωτών"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Το Samba σας επιτρέπει την κοινή χρήση των εκτυπωτών"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5373,17 +5372,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Χρήστες Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -8862,9 +8861,9 @@ msgstr ""
 "Αυτά τα επίπεδα αποθηκεύονται στο <filename>/etc/security/msec/level.&lt;"
 "levelname></filename>. Μπορείτε να ορίσετε τα δικά σας επίπεδα ασφάλειας, να "
 "τα αποθηκεύσετε σε συγκεκριμένα αρχεία με την ονομασία <filename>level.&lt;"
-"levelname></filename>, τοποθετημένα στον φάκελο <filename>/etc/security/msec/."
-"</filename>. Αυτή η λειτουργία προορίζεται σε ειδήμονες χρήστες οι οποίοι "
-"χρειάζονται ένα προσαρμοσμένο ή πιο ασφαλής διαμόρφωση συστήματος."
+"levelname></filename>, τοποθετημένα στον φάκελο <filename>/etc/security/"
+"msec/.</filename>. Αυτή η λειτουργία προορίζεται σε ειδήμονες χρήστες οι "
+"οποίοι χρειάζονται ένα προσαρμοσμένο ή πιο ασφαλής διαμόρφωση συστήματος."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:165
diff --git a/docs/docs/stable/mcc-help/es.po b/docs/docs/stable/mcc-help/es.po
index 8c487d4f..36fabc6a 100644
--- a/docs/docs/stable/mcc-help/es.po
+++ b/docs/docs/stable/mcc-help/es.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-05-24 06:49+0000\n"
 "Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -84,7 +84,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -320,8 +320,8 @@ msgstr ""
 "estos tengan esa capacidad."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "es"
 
@@ -4402,7 +4402,7 @@ msgstr ""
 "la confiabilidad. Vea la página de man exports(5) para mas detalles."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Entradas de menú"
 
@@ -4417,7 +4417,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Archivo|Escribir conf"
 
@@ -4432,7 +4432,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Servidor|Reiniciar"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4445,7 +4445,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Servidor|Recargar"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4959,22 +4959,22 @@ msgstr ""
 "Software_management\">la página Wiki de Mageia </link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Compartir discos y directorios utilizando Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4989,19 +4989,18 @@ msgstr ""
 "este sistema operativo pueden acceder a los recursos del servidor Samba. "
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Preparación"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Para acceder desde otras estaciones de trabajo, el servidor tiene que tener "
 "una dirección IP fija. Esto se puede especificar directamente en el "
@@ -5011,12 +5010,12 @@ msgstr ""
 "permitir que las solicitudes entrantes al servidor Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Asistente - servidor Autónomo"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5025,7 +5024,7 @@ msgstr ""
 "escribiendo <emphasis role=\"bold\">draksambashare</emphasis>."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5037,12 +5036,12 @@ msgstr ""
 "asistente para configurarel servidor Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5051,12 +5050,12 @@ msgstr ""
 "está seleccionada."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5065,7 +5064,7 @@ msgstr ""
 "ser el mismo para el acceso a los recursos compartidos."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5074,17 +5073,17 @@ msgstr ""
 "en la red."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Elija el nivel de seguridad:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5093,7 +5092,7 @@ msgstr ""
 "recurso"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5102,7 +5101,7 @@ msgstr ""
 "al recurso"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5111,12 +5110,12 @@ msgstr ""
 "con la dirección IP o nombre de host."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5125,12 +5124,12 @@ msgstr ""
 "servidor será descrito en las estaciones de trabajo Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5138,12 +5137,12 @@ msgstr ""
 "siguiente paso."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5154,22 +5153,22 @@ msgstr ""
 "etc/samba/smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Asistente - Controlador de dominio primario"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5184,7 +5183,7 @@ msgstr ""
 "servidor independiente, a menos que usted elija también el modo de seguridad:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5196,22 +5195,22 @@ msgstr ""
 "(de seguridad) del dominio."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Declare un directorio a compartir"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Con el botón <guibutton>Añadir</guibutton>, obtenemos:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5224,59 +5223,59 @@ msgstr ""
 "navegable. El nombre del recurso compartido no se puede modificar."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Cuando la lista tiene al menos una entrada, se pueden utilizar las entradas "
 "de menú."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Guardar la configuración actual en <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Servidor de Samba|Configurar"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Se puede ejecutar el asistente de nuevo con esta orden."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba servidor|Reiniciar"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Servidor|Recargar"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Compartir impresora"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba tambien le permite compartir impresoras"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5284,17 +5283,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Usuarios de Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/et.po b/docs/docs/stable/mcc-help/et.po
index 7110d152..1dc14fe2 100644
--- a/docs/docs/stable/mcc-help/et.po
+++ b/docs/docs/stable/mcc-help/et.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: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-05-25 09:43+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -59,7 +59,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -288,8 +288,8 @@ msgstr ""
 "failihaldur seda toetab) oma kataloogid, mida ta soovib välja jagada."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "et"
 
@@ -4313,7 +4313,7 @@ msgstr ""
 "exports(5) manuaalilehekülg."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menüükirjed"
 
@@ -4328,7 +4328,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fail|Salvesta konfiguratsioon"
 
@@ -4343,7 +4343,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS-server|Käivita uuesti"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "Server peatatakse ja käivitatakse uuesti kehtiva seadistusega."
@@ -4354,7 +4354,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS-server|Laadi uuesti"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr "Seadistus laaditakse uuesti parajasti kehtivatest seadistusfailidest."
@@ -4859,22 +4859,22 @@ msgstr ""
 "wiki.mageia.org/en/Software_management\">Mageia wikis</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Kataloogide ja ketaste jagamine Sambaga"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4889,34 +4889,33 @@ msgstr ""
 "operatsioonisüsteemiga masinad ligi Samba serveri ressurssidele."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Valmistumine"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Et teised masinad saaksid serverit kasutada, peab sellel olema fikseeritud "
 "IP-aadress. Selle saab määrata otse serveris, näiteks tööriistaga, millest "
-"kõneleb peatükk <xref linkend=\"draknetcenter\"/>, või DHCP-serveris, "
-"mis tuvastab masina MAC-aadressi järgi ja omistab sellele alati ühe ja sama "
+"kõneleb peatükk <xref linkend=\"draknetcenter\"/>, või DHCP-serveris, mis "
+"tuvastab masina MAC-aadressi järgi ja omistab sellele alati ühe ja sama "
 "aadressi. Samuti peab tulemüür võimaldama päringute esitamist Samba "
 "serverile."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Nõustaja - autonoomne server"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4925,7 +4924,7 @@ msgstr ""
 "<emphasis role=\"bold\">draksambashare</emphasis>."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4937,24 +4936,24 @@ msgstr ""
 "seadistada Samba serverit."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "Alustame autonoomse serveri seadistamisega."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4963,24 +4962,24 @@ msgstr ""
 "jagatud ressursse."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr "NetBIOS-e nimi on nimi, mida kasutatakse serveri tähistamiseks võrgus."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Siis saab valida turberežiimi:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4988,7 +4987,7 @@ msgstr ""
 "<guilabel>user</guilabel>: klient peab autentima, et ressurssi kasutada"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4996,7 +4995,7 @@ msgstr ""
 "<guilabel>share</guilabel>: klient peab autentima iga ressursi puhul eraldi"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5005,12 +5004,12 @@ msgstr ""
 "antakse õigus ressursse kasutada."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5019,23 +5018,23 @@ msgstr ""
 "teada Windowsi masinates."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr "Järgmisel etapil saab määrata, kuhu Samba paigutab oma logid."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5046,22 +5045,22 @@ msgstr ""
 "conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Nõustaja - primaarne domeenikontroller"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5076,7 +5075,7 @@ msgstr ""
 "valida saab veel ühe turbetaseme:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5087,22 +5086,22 @@ msgstr ""
 "jagavad omavahel domeeni (turbe) kontrollerid."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Kataloogi määramine jagatud ressursiks"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Nupule <guibutton>Lisa</guibutton> klõpsates ilmub järgmine dialoog:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5115,57 +5114,57 @@ msgstr ""
 "lehitsetav. Jagatud ressursi nime ei saa muuta."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr "Kui loendis on vähemalt üks kirje, saab kasutada ka menüükäske."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Salvestab kehtiva seadistuse faili <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Seadista"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Selle käsuga saab uuesti tööle panna nõustaja."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba server|Käivita uuesti"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba server|Laadi uuesti"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Printerite jagamine"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba võimaldab jagada ka printereid."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5173,17 +5172,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba kasutajad"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -8221,8 +8220,8 @@ msgstr "<xref linkend=\"drakconsole\"/>"
 msgid ""
 "<xref linkend=\"userdrake\"/><emphasis> = Manage users on system</emphasis>"
 msgstr ""
-"<xref linkend=\"userdrake\"/><emphasis> = Süsteemi kasutajate "
-"haldamine</emphasis>"
+"<xref linkend=\"userdrake\"/><emphasis> = Süsteemi kasutajate haldamine</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:50
diff --git a/docs/docs/stable/mcc-help/eu.po b/docs/docs/stable/mcc-help/eu.po
index 37ac140f..23d16ee1 100644
--- a/docs/docs/stable/mcc-help/eu.po
+++ b/docs/docs/stable/mcc-help/eu.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: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-07-25 08:36+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -58,7 +58,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4354,7 +4354,7 @@ msgstr ""
 "xehetasun gehiagotarako."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menu sarrerak"
 
@@ -4369,7 +4369,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fitxategia|Idatzi conf"
 
@@ -4384,7 +4384,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Zerbitzaria|Berrabiarazi"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4396,7 +4396,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Zerbitzaria|Birkargatu"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4907,22 +4907,22 @@ msgstr ""
 "Wiki orrialdea</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Partekatze gune eta unitateak Samba-rekin"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4937,34 +4937,32 @@ msgstr ""
 "lanpostuek Samba-zerbitzariaren baliabideak atzi ditzakete."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Aurkezpena"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Beste lanpostuetatik sartzeko, zerbitzariak IP helbide finko bat izan behar "
 "du. Hau zuzenean zehaztu daiteke zerbitzarian, adibidez <xref linkend="
-"\"draknetcenter\"/>, edo DHCP zerbitzarian bere MAC-helbide batera "
-"postua identifikatzen du eta beti ematen dio helbide bera. Segurtasun "
-"zerbitzariak halaber Samba zerbitzariko sarrerako eskaerak baimendu egin "
-"behar ditu."
+"\"draknetcenter\"/>, edo DHCP zerbitzarian bere MAC-helbide batera postua "
+"identifikatzen du eta beti ematen dio helbide bera. Segurtasun zerbitzariak "
+"halaber Samba zerbitzariko sarrerako eskaerak baimendu egin behar ditu."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Morroia - Bakarkako zerbitzaria"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4973,7 +4971,7 @@ msgstr ""
 "\">draksambashare</emphasis> root bezala idatziz."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4985,12 +4983,12 @@ msgstr ""
 "jartzeko morroia konfiguratu."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -4999,12 +4997,12 @@ msgstr ""
 "hautatuta dago."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5013,24 +5011,24 @@ msgstr ""
 "sarbidearen  berdina izan behar du."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr "NetBIOS izena sarean zerbitzariak izendatzeko erabiliko den izena da."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Aukeratu segurtasun modua:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5039,7 +5037,7 @@ msgstr ""
 "erabiltzeko"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5048,7 +5046,7 @@ msgstr ""
 "ekintza bakoitzeko"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5057,12 +5055,12 @@ msgstr ""
 "helbide edo host izenarekin."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5071,12 +5069,12 @@ msgstr ""
 "se describe en las estaciones de trabajo de Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5084,12 +5082,12 @@ msgstr ""
 "daiteke."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5100,22 +5098,22 @@ msgstr ""
 "code> idatziko da."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Morroia - Lehen domeinu kontroladorea"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5130,7 +5128,7 @@ msgstr ""
 "dezakezula:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5142,22 +5140,22 @@ msgstr ""
 "artean banatuko da."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Deklaratu partekatzeko direktorio bat"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "<guibutton>Gehitu</guibutton> botoiarekin, lortuko dugu:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5170,59 +5168,59 @@ msgstr ""
 "Partekatutako izena ezin da aldatu."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Zerrendako sarrera bat gutxienez izatea, menu sarrerak erabili ahal izango "
 "dira."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "<code>/etc/samba/smb.conf</code>-n gorde uneko konfigurazioa."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba zerbitzaria|Konfiguratu"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Morroia berriro exekutatu ahal izango da agindu honekin."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba zerbitzaria|Berrabiarazi"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Zerbitzaria|Birkargatu"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Partekatu imprimagailuak"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba halaber inprimagailuak partekatzeko aukera ematen dizu."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5230,17 +5228,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba erabiltzaileak"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -5248,8 +5246,8 @@ msgid ""
 msgstr ""
 "Fitxa horretan, partekatutako baliabideetan sartzeko autentifikazioa behar "
 "denean onartzen baimentuta dagoen erabiltzaile batzuk gehitu ditzakezu. "
-"Erabiltzaileak gehi ditzakezu <xref linkend=\"userdrake\"/>-"
-"tik<placeholder type=\"mediaobject\" id=\"0\"/>"
+"Erabiltzaileak gehi ditzakezu <xref linkend=\"userdrake\"/>-tik<placeholder "
+"type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
diff --git a/docs/docs/stable/mcc-help/fr.po b/docs/docs/stable/mcc-help/fr.po
index 9818dd62..7544e376 100644
--- a/docs/docs/stable/mcc-help/fr.po
+++ b/docs/docs/stable/mcc-help/fr.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-02-10 09:47+0200\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-10 08:13+0000\n"
 "Last-Translator: Aestan <anthony.margerand@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -72,7 +72,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4431,7 +4431,7 @@ msgstr ""
 "exports(5) pour plus de détails."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Entrées du menu"
 
@@ -4446,7 +4446,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fichier|Ecrire la configuration"
 
@@ -4461,7 +4461,7 @@ msgid "NFS Server|Restart"
 msgstr "Serveur NFS|Redémarrer"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4474,7 +4474,7 @@ msgid "NFS Server|Reload"
 msgstr "Serveur NFS|Recharger"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4986,22 +4986,22 @@ msgstr ""
 "Software_management\">https://wiki.mageia.org/en/Software_management</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Partagez vos disques et répertoires avec les systèmes Windows (Samba)"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -5017,12 +5017,12 @@ msgstr ""
 "aux ressources du serveur Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Préparation"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
@@ -5038,12 +5038,12 @@ msgstr ""
 "entrantes vers le serveur Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Assistant - Serveur autonome"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5052,7 +5052,7 @@ msgstr ""
 "sous root :<emphasis role=\"bold\"> draksambashare</emphasis>."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5065,12 +5065,12 @@ msgstr ""
 "le menu <emphasis>Serveur Samba/Configurer</emphasis>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5079,12 +5079,12 @@ msgstr ""
 "déjà coché."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5093,7 +5093,7 @@ msgstr ""
 "celui utilisé pour accéder aux ressources partagées."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5102,17 +5102,17 @@ msgstr ""
 "réseau."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Choisir le mode de sécurité :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5121,7 +5121,7 @@ msgstr ""
 "accéder aux ressources."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5130,7 +5130,7 @@ msgstr ""
 "indépendamment pour chaque partage."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5139,12 +5139,12 @@ msgstr ""
 "ressources via l'adresse IP ou le nom d'hôte."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5153,12 +5153,12 @@ msgstr ""
 "sera décrit par les stations de travail Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5166,12 +5166,12 @@ msgstr ""
 "l'étape suivante."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5182,22 +5182,22 @@ msgstr ""
 "smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Assistant - Contrôleur primaire de domaine"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5213,7 +5213,7 @@ msgstr ""
 "de sécurité :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5225,22 +5225,22 @@ msgstr ""
 "les contrôleurs (de sécurité)."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Déclarer un dossier à partager"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Avec le bouton <guibutton>Ajouter</guibutton>, on obtient :"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5253,60 +5253,60 @@ msgstr ""
 "lecture. Le nom de partage n'est pas modifiable."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Si la liste possède au moins une entrée, les entrées du menu peuvent être "
 "utilisées."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 "Enregistrer la configuration actuelle dans <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Serveur Samba|Configurer"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "L'assistant peut être redémarré avec cette commande."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Serveur Samba|Redémarrer"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Serveur Samba|Recharger"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Partage d'imprimantes"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba permet aussi de partager des imprimantes."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5314,17 +5314,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Utilisateurs Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/hu.po b/docs/docs/stable/mcc-help/hu.po
index 49f157db..202a534c 100644
--- a/docs/docs/stable/mcc-help/hu.po
+++ b/docs/docs/stable/mcc-help/hu.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-01-05 19:43+0000\n"
 "Last-Translator: Ferenc Teknős <teknos.ferenc@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -62,7 +62,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -3557,7 +3557,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr ""
 
@@ -3572,7 +3572,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fájl/Írás conf"
 
@@ -3587,7 +3587,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS kiszolgáló/Újraindítás"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3598,7 +3598,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Kiszolgáló/Újratöltés"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -3992,22 +3992,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4017,35 +4017,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Előkészítés"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4053,97 +4052,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4151,22 +4150,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4176,7 +4175,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4184,22 +4183,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4208,57 +4207,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba kiszolgáló/Beállítás"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba kiszolgáló/Újraindítás"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba kiszolgáló/Újratöltés"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Nyomtatómegosztás"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4266,17 +4265,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba felhasználók"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/id.po b/docs/docs/stable/mcc-help/id.po
index 042cc965..12241c87 100644
--- a/docs/docs/stable/mcc-help/id.po
+++ b/docs/docs/stable/mcc-help/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: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 19:36+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -61,7 +61,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -270,7 +270,8 @@ msgstr ""
 "direktori mereka ke grup fileshare. Di tab Pengguna, klik pengguna yang akan "
 "ditambahkan ke grup fileshare, lalu pada <guimenuitem>Edit</guimenuitem>, di "
 "tab Grup. Tandai grup fileshare lalu klik pada <guibutton>OK</guibutton>. "
-"Informasi lebih lanjut tentang Userdrake, lihat <xref linkend=\"userdrake\">halaman ini</xref>"
+"Informasi lebih lanjut tentang Userdrake, lihat <xref linkend=\"userdrake"
+"\">halaman ini</xref>"
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
@@ -293,8 +294,8 @@ msgstr ""
 "memiliki fasilitas ini."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "id"
 
@@ -4303,7 +4304,7 @@ msgstr ""
 "mengurangi reliabilitas. Lihat halaman ekspor(5) untuk lebih rinci."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Entri menu"
 
@@ -4318,7 +4319,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "File|Write conf"
 
@@ -4333,7 +4334,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Server|Restart"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4345,7 +4346,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Server|Reload"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4845,22 +4846,22 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Berbagi direktori dan perangkat dengan Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4876,19 +4877,18 @@ msgstr ""
 "Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Persiapan"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Untuk diakses dari lingkungan kerja lain, server harus memiliki alamat IP "
 "tetap. Ini bisa ditentukan langsung di server, contohnya dengan <xref "
@@ -4897,12 +4897,12 @@ msgstr ""
 "Firewall juga harus mengizinkan permintaan yang datang ke server Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Panduan - Server mandiri"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4911,7 +4911,7 @@ msgstr ""
 "role=\"bold\"> draksambashare</emphasis> sebagai root."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4923,12 +4923,12 @@ msgstr ""
 "dijalankan."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -4936,12 +4936,12 @@ msgstr ""
 "Pada jendela selanjutnya pilihan konfigurasi Server mandiri sudah terpilih."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4950,7 +4950,7 @@ msgstr ""
 "daya yang dibagi."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -4959,17 +4959,17 @@ msgstr ""
 "jaringan."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Pilih mode keamanan:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4978,7 +4978,7 @@ msgstr ""
 "daya"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4987,7 +4987,7 @@ msgstr ""
 "setiap pembagian"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -4996,12 +4996,12 @@ msgstr ""
 "dengan alamat IP atau nama host."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5010,12 +5010,12 @@ msgstr ""
 "lingkungan kerja Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5023,12 +5023,12 @@ msgstr ""
 "selanjutnya."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5039,22 +5039,22 @@ msgstr ""
 "smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Panduan - Pengendali domain primer"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5068,7 +5068,7 @@ msgstr ""
 "untuk server mandiri, kecuali Anda juga bisa memilih mode keamanan:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5079,22 +5079,22 @@ msgstr ""
 "Repositori akun terpusat dibagi di antara pengendali (keamanan)."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Mengumumkan direktori untuk dibagi"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Dengan tombol <guibutton>Tambah</guibutton>, kita mendapat:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5107,58 +5107,58 @@ msgstr ""
 "tidak bisa dimodifikasi."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Ketika daftar memiliki setidaknya satu entri, entri menu bisa digunakan."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Simpan konfigurasi saat ini di <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Configure"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Panduan bisa dijalankan lagi dengan perintah ini."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba server|Restart"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Server|Reload"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Pembagian printer"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba juga memungkinkan Anda untuk membagi printer."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5166,17 +5166,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Pengguna samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -5184,8 +5184,8 @@ msgid ""
 msgstr ""
 "Di tab ini, Anda bisa menambah pengguna yang diizinkan untuk mengakses "
 "sumber daya yang dibagi ketika otentikasi diperlukan. Anda bisa menambah "
-"pengguna dari <xref linkend=\"userdrake\"/><placeholder type="
-"\"mediaobject\" id=\"0\"/>"
+"pengguna dari <xref linkend=\"userdrake\"/><placeholder type=\"mediaobject\" "
+"id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -8562,11 +8562,11 @@ msgid ""
 "intended for power users which require a customised or more secure system "
 "configuration."
 msgstr ""
-"Tingkatan ini tersimpan di <filename>/etc/security/msec/level.&lt;levelname></"
-"filename>. Anda bisa menentukan tingkat keamanan yang Anda sesuaikan, "
-"menyimpannya ke file spesifik yang disebut <filename>level.&lt;levelname></"
-"filename>, tempatkan ke dalam folder <filename>/etc/security/msec/.</"
-"filename> Fungsi ini dimaksudkan untuk power user yang membutuhkan "
+"Tingkatan ini tersimpan di <filename>/etc/security/msec/level.&lt;"
+"levelname></filename>. Anda bisa menentukan tingkat keamanan yang Anda "
+"sesuaikan, menyimpannya ke file spesifik yang disebut <filename>level.&lt;"
+"levelname></filename>, tempatkan ke dalam folder <filename>/etc/security/"
+"msec/.</filename> Fungsi ini dimaksudkan untuk power user yang membutuhkan "
 "konfigurasi sistem yang lebih aman atau yang disesuaikan."
 
 #. type: Content of: <section><section><section><caution><para>
diff --git a/docs/docs/stable/mcc-help/it.po b/docs/docs/stable/mcc-help/it.po
index d1eb0dcc..88eb2016 100644
--- a/docs/docs/stable/mcc-help/it.po
+++ b/docs/docs/stable/mcc-help/it.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 19:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -64,7 +64,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -300,8 +300,8 @@ msgstr ""
 "gestori di file forniscono questa funzionalità."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "it"
 
@@ -3684,7 +3684,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Voci del menù"
 
@@ -3699,7 +3699,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3714,7 +3714,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3725,7 +3725,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4129,22 +4129,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4160,35 +4160,34 @@ msgstr ""
 "risorse del derver Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Preparazione"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Procedura guidata - server autonomo"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4196,12 +4195,12 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -4210,85 +4209,85 @@ msgstr ""
 "già selezionata."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Scegliere la modalità di sicurezza:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4296,22 +4295,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4321,7 +4320,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4329,22 +4328,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Dichiarare una directory da salvare"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4353,57 +4352,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Salva l'attuale configurazione in <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Server Samba|Restart"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Servar Samba|Ricarica"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Stampanti condivise"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba ti permette anche di condividere stampanti."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4411,17 +4410,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Utilizzatori di Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/ja.po b/docs/docs/stable/mcc-help/ja.po
index c2403410..937d46cc 100644
--- a/docs/docs/stable/mcc-help/ja.po
+++ b/docs/docs/stable/mcc-help/ja.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-02-10 09:47+0200\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-27 13:24+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -58,7 +58,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4304,7 +4304,7 @@ msgstr ""
 "い。"
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "メニュー エントリ"
 
@@ -4319,7 +4319,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "ファイル|設定を書き込む"
 
@@ -4334,7 +4334,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS サーバ|再起動"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "サーバを停止した後、現在の設定ファイルを用いて再起動します。"
@@ -4345,7 +4345,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS サーバ|再読み込み"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr "表示されている設定は現在の設定ファイルから再読み込みされます。"
@@ -4841,22 +4841,22 @@ msgstr ""
 "Software_management\">Mageia Wiki のページ</link>を参照してください。"
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "ディレクトリやドライブを Samba で共有する"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4871,12 +4871,12 @@ msgstr ""
 "サーバのリソースにアクセスすることができます。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "準備"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
@@ -4891,12 +4891,12 @@ msgstr ""
 "への外部からの要求を許可する必要もあります。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "ウィザード - スタンドアロン サーバ"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4905,7 +4905,7 @@ msgstr ""
 "\">draksambashare</emphasis> を root として入力します。"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4916,24 +4916,24 @@ msgstr ""
 "ように提案します。その後 Samba サーバの設定ウィザードが起動します。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "次のウィンドウで、スタンドアロン サーバの設定は既に選択されています。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4942,24 +4942,24 @@ msgstr ""
 "同じものにしてください。"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr "netbios 名はネットワーク上でサーバを示す名前です。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "セキュリティ モードを選択します:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4968,7 +4968,7 @@ msgstr ""
 "なければなりません"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4976,7 +4976,7 @@ msgstr ""
 "<guilabel>共有</guilabel>: クライアントは各共有ごとに別々に認証を行います"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -4984,12 +4984,12 @@ msgstr ""
 "リソースにアクセスできるホストを IP アドレスもしくはホスト名で指定できます。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -4998,23 +4998,23 @@ msgstr ""
 "で説明する方法です。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr "Samba が情報を記録可能な場所は次のステップで指定できます。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5024,22 +5024,22 @@ msgstr ""
 "け入れた場合、設定は <code>/etc/samba/smb.conf</code> に書き込まれます。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "ウィザード - プライマリ ドメイン コントローラ"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5053,7 +5053,7 @@ msgstr ""
 "のステップが続きますが、セキュリティ モードを選択できる点が異なります:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5064,22 +5064,22 @@ msgstr ""
 "ト リポジトリは (セキュリティ) コントローラ間で共有されます。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "ディレクトリを共有する"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "<guibutton>追加</guibutton>ボタンを押すと、以下のダイアログが現れます:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5091,58 +5091,58 @@ msgstr ""
 "書き込み可能や閲覧可能といった項目が編集できます。共有名は変更できません。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "一覧に一つ以上のエントリがあるときに、メニューのエントリが使用できます。"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "現在の設定を <code>/etc/samba/smb.conf</code> に保存します。"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba サーバ|設定"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "このコマンドにより、ウィザードを再度実行できます。"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba サーバ|再起動"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba サーバ|再読み込み"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "プリンタの共有"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba はプリンタを共有することもできます。"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5150,17 +5150,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba のユーザ"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/nb.po b/docs/docs/stable/mcc-help/nb.po
index d8db7c84..4f0dd22d 100644
--- a/docs/docs/stable/mcc-help/nb.po
+++ b/docs/docs/stable/mcc-help/nb.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-02-10 09:47+0200\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-14 23:41+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -58,7 +58,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -580,8 +580,8 @@ msgid ""
 "Click on the server name and on &gt; before the server name to display the "
 "list of the shared directories and select the directory you want to access."
 msgstr ""
-"Klikk på servernavnet og på &gt; før servernavnet viser listen over de "
-"delte katalogene og velg katalogen du vil ha tilgang til."
+"Klikk på servernavnet og på &gt; før servernavnet viser listen over de delte "
+"katalogene og velg katalogen du vil ha tilgang til."
 
 #. type: Content of: <section><section><para>
 #: en/diskdrake--smb.xml:47
@@ -1013,9 +1013,9 @@ msgid ""
 "installed in /boot/EFI partition. This FAT32 formatted partition is common "
 "to all operating systems installed."
 msgstr ""
-"I et UEFI-system er bootloaderen  <guilabel>Grub2-efi</guilabel> og er installert i / "
-"boot / EFI partisjon. Denne FAT32 formaterte partisjonen er vanlig for alle "
-"operativsystemer som er installert."
+"I et UEFI-system er bootloaderen  <guilabel>Grub2-efi</guilabel> og er "
+"installert i / boot / EFI partisjon. Denne FAT32 formaterte partisjonen er "
+"vanlig for alle operativsystemer som er installert."
 
 #. type: Content of: <section><para>
 #: en/drakboot.xml:50
@@ -2937,8 +2937,8 @@ msgstr ""
 "innkommende tilkoblinger fra utsiden er blokkert hvis de ikke er "
 "autoriserte. I det første skjermbildet ovenfor kan du velge tjenestene som "
 "eksterne tilkoblingsforsøk aksepteres for. For sikkerheten fjerner du den "
-"første boksen - <guilabel>Alt (ingen brannmur)</guilabel> - med mindre du vil "
-"deaktivere brannmuren, og bare sjekke de nødvendige tjenestene."
+"første boksen - <guilabel>Alt (ingen brannmur)</guilabel> - med mindre du "
+"vil deaktivere brannmuren, og bare sjekke de nødvendige tjenestene."
 
 #. type: Content of: <section><para>
 #: en/drakfirewall.xml:27
@@ -4317,7 +4317,7 @@ msgstr ""
 "stabiliteten. Se eksport (5) man side for flere detaljer."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menyoppføringer"
 
@@ -4332,7 +4332,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fil|Skriv konf"
 
@@ -4347,7 +4347,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Server|Omstart"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "Serveren er stoppet og omstartet med gjeldende konfigurasjonsfiler."
@@ -4358,7 +4358,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Server|Last på nytt"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4857,22 +4857,22 @@ msgstr ""
 "wiki.mageia.org/en/Software_management\">Mageia Wiki-siden</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Del kataloger og stasjoner med Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4887,12 +4887,12 @@ msgstr ""
 "dette operativsystemet kan få tilgang til ressursene til Samba-serveren."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Forberedelse"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
@@ -4907,12 +4907,12 @@ msgstr ""
 "forespørsler til Samba-serveren."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Veiviser - Enkeltstående server"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4921,7 +4921,7 @@ msgstr ""
 "\"bold\">draksambashare</emphasis> som root."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4933,12 +4933,12 @@ msgstr ""
 "Samba-serveren."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -4947,12 +4947,12 @@ msgstr ""
 "valgt."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4961,7 +4961,7 @@ msgstr ""
 "som for tilgang til delte ressurser."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -4970,17 +4970,17 @@ msgstr ""
 "nettverket."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Velg sikkerhetsmodus:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4989,7 +4989,7 @@ msgstr ""
 "til ressursen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4998,7 +4998,7 @@ msgstr ""
 "ressurs"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5007,12 +5007,12 @@ msgstr ""
 "adresse eller vertsnavn."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5021,23 +5021,23 @@ msgstr ""
 "Windows-arbeidsstasjonene."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr "Der Samba kan logge informasjon. Dette kan spesifiseres i neste trinn."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5048,22 +5048,22 @@ msgstr ""
 "samba/smb.conf."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Veiviser - primær domenekontroller"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5077,7 +5077,7 @@ msgstr ""
 "for frittstående server, bortsett fra at du også kan velge sikkerhetsmodus:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5088,22 +5088,22 @@ msgstr ""
 "kontoarkivet deles mellom (sikkerhets) kontrollører."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Angi en katalog som skal deles"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Med <guibutton>Legg til</guibutton> knappen får vi:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5115,57 +5115,57 @@ msgstr ""
 "publikum, skrivbar eller kunne leses. Delingsnavnet kan ikke endres."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr "Når listen har minst en oppføring, kan menyoppføringene brukes."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Lagre gjeldende konfigurasjon i /etc/samba/smb.conf."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Konfigurer"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Veiviseren kan kjøres på nytt med denne kommandoen."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba Server|Omstart"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Server|Last på nytt"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Delt skriverressurs"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba tillater deg også å dele skrivere."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5173,17 +5173,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Sambabrukere"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -6926,8 +6926,8 @@ msgid ""
 "category. Each device can be selected in this column."
 msgstr ""
 "Den venstre kolonnen inneholder en liste over den oppdagede maskinvaren. "
-"Enhetene er gruppert etter kategorier. Klikk på &gt; å utvide innholdet i "
-"en kategori. Hver enhet kan velges i denne kolonnen."
+"Enhetene er gruppert etter kategorier. Klikk på &gt; å utvide innholdet i en "
+"kategori. Hver enhet kan velges i denne kolonnen."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:39
@@ -8308,8 +8308,8 @@ msgid ""
 "immediately taken into account."
 msgstr ""
 "Musene er sortert etter tilkoblingstype og deretter etter modell. Velg musen "
-"og klikk på OK. Mesteparten av tiden \"Universal / Any PS / 2 &amp; USB-mus\" er "
-"egnet for en ny mus. Den nye musen aktiveres umiddelbart."
+"og klikk på OK. Mesteparten av tiden \"Universal / Any PS / 2 &amp; USB-mus"
+"\" er egnet for en ny mus. Den nye musen aktiveres umiddelbart."
 
 #. type: Content of: <section><info><title>
 #: en/msecgui.xml:3
@@ -9411,10 +9411,11 @@ msgid ""
 "It also allows you to share local devices connected to this computer with a "
 "remote computer or to access remote scanners."
 msgstr ""
-"Dette verktøyet <placeholder type=\"footnote\" id=\"0\"/> lar deg konfigurere en enkelt skannerenhet eller en "
-"multifunksjonsenhet som inkluderer skanning. Den lar deg også dele lokale "
-"enheter koblet til denne datamaskinen med en ekstern datamaskin eller for å "
-"få tilgang til eksterne skannere."
+"Dette verktøyet <placeholder type=\"footnote\" id=\"0\"/> lar deg "
+"konfigurere en enkelt skannerenhet eller en multifunksjonsenhet som "
+"inkluderer skanning. Den lar deg også dele lokale enheter koblet til denne "
+"datamaskinen med en ekstern datamaskin eller for å få tilgang til eksterne "
+"skannere."
 
 #. type: Content of: <section><section><para>
 #: en/scannerdrake.xml:29
@@ -9737,9 +9738,10 @@ msgstr ""
 "Drivere er tilgjengelige fra<link xlink:href=\"http://download.ebz.epson.net/"
 "dsc/search/01/search/?OSC=LX\"> denne siden</link>. Når det er bes om det, "
 "må du først installere <emphasis>iscan-data</emphasis> pakken, så "
-"<emphasis>iscan</emphasis> (i denne rekkefølgen). Det er mulig at <emphasis>iscan</"
-"emphasis>-pakken vil generere en advarsel om en konflikt med <emphasis>sane</"
-"emphasis>. Brukere har rapportert at denne advarselen kan ignoreres."
+"<emphasis>iscan</emphasis> (i denne rekkefølgen). Det er mulig at "
+"<emphasis>iscan</emphasis>-pakken vil generere en advarsel om en konflikt "
+"med <emphasis>sane</emphasis>. Brukere har rapportert at denne advarselen "
+"kan ignoreres."
 
 #. type: Content of: <section><section><info><title>
 #: en/scannerdrake.xml:231
@@ -10163,10 +10165,10 @@ msgid ""
 "changed. After the selection of the protocol, the selection of the driver is "
 "the same as above."
 msgstr ""
-"Velg alternativet <guilabel>AppSocket / HP JetDirect</guilabel> som protokoll og angi "
-"adressen i <guilabel>verten:,</guilabel> ikke endre <guilabel>portnummeret,</"
-"guilabel> med mindre du vet at den må endres. Etter valg av protokollen er "
-"valg av driver det samme som ovenfor."
+"Velg alternativet <guilabel>AppSocket / HP JetDirect</guilabel> som "
+"protokoll og angi adressen i <guilabel>verten:,</guilabel> ikke endre "
+"<guilabel>portnummeret,</guilabel> med mindre du vet at den må endres. Etter "
+"valg av protokollen er valg av driver det samme som ovenfor."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
 #: en/system-config-printer.xml:180
@@ -10793,9 +10795,9 @@ msgid ""
 "entry of a family name and first name, but it is possible to write anything "
 "or nothing as well!"
 msgstr ""
-"<emphasis role=\"bold\">Feltet Fullt</emphasis> navn er ment for oppføring av et "
-"etternavn og fornavn, men det er også mulig å skrive noe eller ingenting "
-"også!"
+"<emphasis role=\"bold\">Feltet Fullt</emphasis> navn er ment for oppføring "
+"av et etternavn og fornavn, men det er også mulig å skrive noe eller "
+"ingenting også!"
 
 #. type: Content of: <section><para>
 #: en/userdrake.xml:49
diff --git a/docs/docs/stable/mcc-help/nl.po b/docs/docs/stable/mcc-help/nl.po
index f982634f..c868d225 100644
--- a/docs/docs/stable/mcc-help/nl.po
+++ b/docs/docs/stable/mcc-help/nl.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: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-02 00:29+0000\n"
 "Last-Translator: dragnadh <dragnadh@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,7 +65,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -299,8 +299,8 @@ msgstr ""
 "Helaas bieden niet alle bestandsbeheerders deze mogelijkheid."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "nl"
 
@@ -4357,7 +4357,7 @@ msgstr ""
 "verminderen. Voor meer informatie kunt u de man-pagina exports(5) lezen."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menu-ingangen"
 
@@ -4372,7 +4372,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Bestand|Schrijf-conf"
 
@@ -4387,7 +4387,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS-server|Herstarten"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4399,7 +4399,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS-server|Herladen"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4901,22 +4901,22 @@ msgstr ""
 "media."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Deel directories en schijven met Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4932,34 +4932,33 @@ msgstr ""
 "server bereiken."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Voorbereiding"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Om toegankelijk te zijn voor andere workstations moet de server een "
 "vastgezet IP-adres hebben. Dit kan direct op de server worden gekozen, "
-"bijvoorbeeld met <xref linkend=\"draknetcenter\"/> of op de DHCP-server "
-"die het station identificeert met zijn MAC-adres en het altijd hetzelfde "
-"adres geeft. De firewall moet ook de bij de Samba-server inkomende verzoeken "
+"bijvoorbeeld met <xref linkend=\"draknetcenter\"/> of op de DHCP-server die "
+"het station identificeert met zijn MAC-adres en het altijd hetzelfde adres "
+"geeft. De firewall moet ook de bij de Samba-server inkomende verzoeken "
 "toestaan."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Wizard - Losstaande server"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4968,7 +4967,7 @@ msgstr ""
 "\"bold\">draksambashare</emphasis> te typen."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4980,12 +4979,12 @@ msgstr ""
 "server te configureren gestart."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -4994,12 +4993,12 @@ msgstr ""
 "geselecteerd."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5008,7 +5007,7 @@ msgstr ""
 "voor de toegang tot de gedeelde hulpbronnen."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5017,17 +5016,17 @@ msgstr ""
 "netwerk te bepalen."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Kies de beveiligingsmodus:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5036,7 +5035,7 @@ msgstr ""
 "hulpbron te bereiken"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5045,7 +5044,7 @@ msgstr ""
 "share"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5054,12 +5053,12 @@ msgstr ""
 "hulpbronnen."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5068,12 +5067,12 @@ msgstr ""
 "beschreven in de Windows-werkstations."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5081,12 +5080,12 @@ msgstr ""
 "volgende stap."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5097,22 +5096,22 @@ msgstr ""
 "geschreven worden in <code>/etc/samba/smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Wizard - Hoofddomeinbestuurder"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5127,7 +5126,7 @@ msgstr ""
 "dan dat u ook de beveiligingsmodus kunt kiezen:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5139,22 +5138,22 @@ msgstr ""
 "(beveiligings)controllers"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Geef een map aan om te delen"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Met de <guibutton>Toevoegen</guibutton> knop, krijgen we:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5167,59 +5166,59 @@ msgstr ""
 "beschrijfbaar is. De naam die is gedeeld kan niet worden gewijzigd."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Pas wanneer de lijst ten minste één vermelding heeft, kunnen menu-"
 "vermeldingen worden gebruikt."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Sla de huidige configuratie op in <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Configureren"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "De wizard kan opnieuw worden uitgevoerd met deze opdracht."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba server|Herstarten"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Server|Herladen"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Gedeelde printers"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Met Samba kunt u ook printers delen."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5227,17 +5226,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba-gebruikers"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -5245,8 +5244,8 @@ msgid ""
 msgstr ""
 "In dit tabblad kunt u gebruikers toevoegen die toegang hebben tot de "
 "gedeelde bronnen waarvoor verificatie is vereist. U kunt gebruikers "
-"toevoegen vanuit <xref linkend=\"userdrake\"/><placeholder type="
-"\"mediaobject\" id=\"0\"/>"
+"toevoegen vanuit <xref linkend=\"userdrake\"/><placeholder type=\"mediaobject"
+"\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -8666,9 +8665,9 @@ msgid ""
 msgstr ""
 "In <filename>/etc/security/msec/niveau.&lt;niveaunaam></filename> zijn de "
 "niveaus opgeslagen. U kunt aangepaste beveiligingsniveaus maken en deze in "
-"de map <filename>/etc/security/msec/.</filename> opslaan als <filename>niveau."
-"&lt;niveaunaam></filename>. Dit is bedoeld voor ervaren gebruikers die hun "
-"systeembeveiliging naar wens willen instellen."
+"de map <filename>/etc/security/msec/.</filename> opslaan als "
+"<filename>niveau.&lt;niveaunaam></filename>. Dit is bedoeld voor ervaren "
+"gebruikers die hun systeembeveiliging naar wens willen instellen."
 
 #. type: Content of: <section><section><section><caution><para>
 #: en/msecgui.xml:165
diff --git a/docs/docs/stable/mcc-help/pl.po b/docs/docs/stable/mcc-help/pl.po
index 3b0c6340..ef2fedf2 100644
--- a/docs/docs/stable/mcc-help/pl.po
+++ b/docs/docs/stable/mcc-help/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 15:57+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -62,7 +62,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -256,8 +256,8 @@ msgstr ""
 "dla grupy fileshare. W sekcju Użytkownicy, kliknij na użytkownika i dodaj go "
 "do grupy fileshare, następnie w <guimenuitem>Edytuj</guimenuitem> w sekcji "
 "Grupy. Sprawdź grupę fileshare i kliknij na <guibutton>OK</guibutton>. Aby "
-"uzyskać więcej informacji o Userdrake, zobacz <xref linkend=\"userdrake"
-"\">tę stronę</xref>"
+"uzyskać więcej informacji o Userdrake, zobacz <xref linkend=\"userdrake\">tę "
+"stronę</xref>"
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
@@ -280,8 +280,8 @@ msgstr ""
 "plików posiadają taką opcję."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "pl"
 
@@ -3586,7 +3586,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr ""
 
@@ -3601,7 +3601,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3616,7 +3616,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3627,7 +3627,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4021,22 +4021,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4046,35 +4046,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4082,97 +4081,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4180,22 +4179,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4205,7 +4204,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4213,22 +4212,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4237,57 +4236,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4295,17 +4294,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/pt_BR.po b/docs/docs/stable/mcc-help/pt_BR.po
index 377aa324..ed85f6fd 100644
--- a/docs/docs/stable/mcc-help/pt_BR.po
+++ b/docs/docs/stable/mcc-help/pt_BR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2018-02-10 09:47+0200\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2018-02-20 14:37+0000\n"
 "Last-Translator: Michael Martins <michaelfm21@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -67,7 +67,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4377,7 +4377,7 @@ msgstr ""
 "confiabilidade. Veja as exportações (5) man page para obter mais detalhes."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "entradas de menu"
 
@@ -4392,7 +4392,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Arquivo|Escrever conf"
 
@@ -4407,7 +4407,7 @@ msgid "NFS Server|Restart"
 msgstr "Servidor NFS|Restart"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4419,7 +4419,7 @@ msgid "NFS Server|Reload"
 msgstr "Servidor NFS|Recarregar"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4931,22 +4931,22 @@ msgstr ""
 "\">página Wiki Mageia</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Compartilhar diretórios e discos com Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4962,12 +4962,12 @@ msgstr ""
 "servidor Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "preparação"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
@@ -4983,12 +4983,12 @@ msgstr ""
 "servidor Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Wizard - servidor Standalone"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4997,7 +4997,7 @@ msgstr ""
 "role=\"bold\"> draksambashare </emphasis> como root."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5009,12 +5009,12 @@ msgstr ""
 "configurar o servidor Samba é lançado."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5023,12 +5023,12 @@ msgstr ""
 "selecionado."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5037,7 +5037,7 @@ msgstr ""
 "mesmo para o acesso aos recursos compartilhados."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5045,17 +5045,17 @@ msgstr ""
 "O nome NetBIOS é o nome que vai ser usado para designar o servidor da rede."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Escolha o modo de segurança:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5064,7 +5064,7 @@ msgstr ""
 "recurso"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5073,7 +5073,7 @@ msgstr ""
 "ação"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5082,12 +5082,12 @@ msgstr ""
 "com o endereço IP ou nome do host."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5096,12 +5096,12 @@ msgstr ""
 "descrito nas estações de trabalho do Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5109,12 +5109,12 @@ msgstr ""
 "próxima etapa."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5125,22 +5125,22 @@ msgstr ""
 "samba/smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Wizard - controlador de domínio primário"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5155,7 +5155,7 @@ msgstr ""
 "exceto que você pode escolher também o modo de segurança:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5167,22 +5167,22 @@ msgstr ""
 "controladores (segurança)."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Declare um diretório para compartilhar"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Com o botão <guibutton>Adicionar</guibutton>, temos:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5195,58 +5195,58 @@ msgstr ""
 "compartilhamento não pode ser modificado."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Quando a lista tem pelo menos uma entrada, entrada de menu pode ser usado."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Salve a configuração atual em <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Servidor Samba|Configurar"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "O assistente pode ser executado novamente com este comando."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Servidor Samba|Restart"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Servidor Samba|Recarregar"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "compartilhar Impressoras"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba também permite que você compartilhe impressoras."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5254,17 +5254,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "usuários do Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/ro.po b/docs/docs/stable/mcc-help/ro.po
index a2f259c2..9b21799e 100644
--- a/docs/docs/stable/mcc-help/ro.po
+++ b/docs/docs/stable/mcc-help/ro.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: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 19:52+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -61,7 +61,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -272,8 +272,8 @@ msgstr ""
 "utilizatorul de adăugat în grupul „fileshare” și apoi pe "
 "<guimenuitem>Editează</guimenuitem>. În categoria „Grupuri” bifați grupul "
 "„fileshare” și faceți clic pe <guibutton>OK</guibutton>. Pentru informații "
-"suplimentare despre userdrake consultați <xref linkend=\"userdrake"
-"\">această pagină</xref>."
+"suplimentare despre userdrake consultați <xref linkend=\"userdrake\">această "
+"pagină</xref>."
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
@@ -297,8 +297,8 @@ msgstr ""
 "funcționalitate."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "ro"
 
@@ -4373,7 +4373,7 @@ msgstr ""
 "multe detalii."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Intrări de meniu"
 
@@ -4388,7 +4388,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Fișier|Scrie configurația"
 
@@ -4403,7 +4403,7 @@ msgid "NFS Server|Restart"
 msgstr "Repornire server NFS"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "Serverul s-a oprit și a repornit cu fișierele de configurație actuale."
@@ -4414,7 +4414,7 @@ msgid "NFS Server|Reload"
 msgstr "Reîncărcare server NFS"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4929,22 +4929,22 @@ msgstr ""
 "Wiki</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Partajați discuri și directoare cu Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4959,19 +4959,18 @@ msgstr ""
 "cu acest sistem de operare pot accesa resursele serverului Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Pregătire"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Pentru a putea fi accesat de celelalte calculatoare, serverul trebuie să "
 "aibă o adresă IP fixă. Aceasta poate fi specificată direct pe server, de "
@@ -4981,12 +4980,12 @@ msgstr ""
 "Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Asistent - Server autonom"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4995,7 +4994,7 @@ msgstr ""
 "\"bold\"> draksambashare</emphasis> ca root."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5007,12 +5006,12 @@ msgstr ""
 "serverului Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5021,12 +5020,12 @@ msgstr ""
 "selectată."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5035,7 +5034,7 @@ msgstr ""
 "utilizat pentru a accesa resursele partajate."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5044,17 +5043,17 @@ msgstr ""
 "rețea."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Alegeți modul de securitate:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5063,7 +5062,7 @@ msgstr ""
 "resursa"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5072,7 +5071,7 @@ msgstr ""
 "partaj"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5081,12 +5080,12 @@ msgstr ""
 "adresa IP sau numele de gazdă."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5095,12 +5094,12 @@ msgstr ""
 "descris pe stațiile Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5108,12 +5107,12 @@ msgstr ""
 "specificat la etapa următoare."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5124,22 +5123,22 @@ msgstr ""
 "smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Asistent - Controlor de domeniu principal"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5154,7 +5153,7 @@ msgstr ""
 "și un mod de securitate:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5166,22 +5165,22 @@ msgstr ""
 "(de securitate)."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Declarați un director pentru partajat"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Cu butonul <guibutton>Adaugă</guibutton> obținem:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5194,58 +5193,58 @@ msgstr ""
 "editate. În schimb, numele de partaj nu poate fi modificat."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Cînd lista conține cel puțin o intrare, intrările din meniu pot fi utilizate."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Salvează configurația curentă în <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Server Samba | Configurare"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Asistentul poate fi lansat din nou cu această comandă."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Server Samba | Repornire"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Server Samba | Reîncărcare"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Partajare imprimante"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba vă permite să partajați și imprimantele."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5253,17 +5252,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Utilizatori Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -5271,8 +5270,8 @@ msgid ""
 msgstr ""
 "În această secțiune puteți adăuga utilizatorii care au dreptul să acceseze "
 "resursele partajate cînd este cerută autentificarea. Puteți adăuga "
-"utilizatorii din <xref linkend=\"userdrake\"/><placeholder type="
-"\"mediaobject\" id=\"0\"/>"
+"utilizatorii din <xref linkend=\"userdrake\"/><placeholder type=\"mediaobject"
+"\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
diff --git a/docs/docs/stable/mcc-help/ru.po b/docs/docs/stable/mcc-help/ru.po
index 6b8b7674..0fa4c920 100644
--- a/docs/docs/stable/mcc-help/ru.po
+++ b/docs/docs/stable/mcc-help/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-08-05 14:22+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,7 +65,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4503,7 +4503,7 @@ msgstr ""
 "exports(5)."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Пункты меню"
 
@@ -4518,7 +4518,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Файл|Записать настройки"
 
@@ -4533,7 +4533,7 @@ msgid "NFS Server|Restart"
 msgstr "Сервер NFS|Перезапустить"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4546,7 +4546,7 @@ msgid "NFS Server|Reload"
 msgstr "Сервер NFS|Перезагрузить"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -5076,22 +5076,22 @@ msgstr ""
 "страницей в вики Mageia </link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Совместное использование каталогов и дисков с использованием Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -5107,34 +5107,33 @@ msgstr ""
 "системы могут получать доступ к ресурсам на сервере Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Подготовка"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Чтобы пользователи могли получать доступ к вашим ресурсам, сервер должен "
 "иметь постоянный IP-адрес. Определить этот URL-адрес можно непосредственно "
-"на вашем сервере, например с помощью <xref linkend=\"draknetcenter\"/> "
-"или на сервере DHCP, который идентифицирует рабочую станцию по MAC-адресу и "
+"на вашем сервере, например с помощью <xref linkend=\"draknetcenter\"/> или "
+"на сервере DHCP, который идентифицирует рабочую станцию по MAC-адресу и "
 "всегда придаёт ей тот же адрес в сети. Также файервол вашего компьютера "
 "должен разрешать входящие соединения с сервера Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Мастер - Автономный сервер"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5144,7 +5143,7 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5156,12 +5155,12 @@ msgstr ""
 "мастер настройки сервера Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5170,12 +5169,12 @@ msgstr ""
 "обозначен."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5184,7 +5183,7 @@ msgstr ""
 "группы, которая будет получать доступ к ресурсам общего пользования."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5193,17 +5192,17 @@ msgstr ""
 "сервера сети."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Выберите режим защиты:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5212,7 +5211,7 @@ msgstr ""
 "чтобы получить доступ к ресурсу."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5221,7 +5220,7 @@ msgstr ""
 "распознавания, отдельно для каждого общего ресурса."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5230,12 +5229,12 @@ msgstr ""
 "предоставлен доступ к ресурсам."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5244,12 +5243,12 @@ msgstr ""
 "представлен на рабочих станциях Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5257,12 +5256,12 @@ msgstr ""
 "своей работы."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5274,22 +5273,22 @@ msgstr ""
 "code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Мастер: Основной контроллер домена"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5304,7 +5303,7 @@ msgstr ""
 "сервера, кроме того, что вам придётся указать режим защиты:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5316,24 +5315,24 @@ msgstr ""
 "предоставляется в использование контролерами безопасности домена."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Назначение каталога, доступ к которому будет открыт"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 "Если нажать кнопку <guibutton>Добавить</guibutton>, будет показано следующее "
 "окно:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5346,59 +5345,59 @@ msgstr ""
 "к записи или чтению. Менять имя общего ресурса нельзя."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Если в списке будет хоть одна запись, можно будет воспользоваться пунктами "
 "меню."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Сохранить текущие настройки в файле <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Сервер Samba|Настройка"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "С помощью этой команды можно снова запустить мастер."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Сервер Samba|Перезапустить"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Сервер Samba|Перезагрузить"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Совместный доступ к принтерам"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "С помощью Samba можно также предоставлять общий доступ к принтерам."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5406,17 +5405,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Пользователи Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/sl.po b/docs/docs/stable/mcc-help/sl.po
index 713eb5ab..d160260f 100644
--- a/docs/docs/stable/mcc-help/sl.po
+++ b/docs/docs/stable/mcc-help/sl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-07-27 23:30+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -62,7 +62,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -3637,7 +3637,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Vnosi menija"
 
@@ -3652,7 +3652,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Datoteka|Zapiši nastavitve"
 
@@ -3667,7 +3667,7 @@ msgid "NFS Server|Restart"
 msgstr "Strežnik NFS|Ponovni zagon"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -3678,7 +3678,7 @@ msgid "NFS Server|Reload"
 msgstr "Strežnik NFS|Ponovno nalaganje"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4080,22 +4080,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Dajte diske in mape v skupno rabo prek Sambe"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4105,28 +4105,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Priprava"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Čarovnik - samostojni strežnik"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4135,7 +4134,7 @@ msgstr ""
 "draksambashare</emphasis> kot skrbnik."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4143,48 +4142,48 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Izberite varnostni način:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4192,7 +4191,7 @@ msgstr ""
 "<guilabel>Uporabnik</guilabel>: za dostop do vira se mora odjemalec overiti"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4201,42 +4200,42 @@ msgstr ""
 "posebej"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4244,22 +4243,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Čarovnik - glavni nadzornik domene"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4269,7 +4268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4277,22 +4276,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Določite mapo za skupno rabo."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Z gumbom <guibutton>Dodaj</guibutton> dobimo:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4301,57 +4300,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Strežnik Samba|Ponovni zagon"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Strežnik Samba|Ponovno nalaganje"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Tiskalniki za skupno rabo"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4359,17 +4358,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Uporabniki Sambe"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -7109,7 +7108,8 @@ msgstr ""
 "To orodje<placeholder type=\"footnote\" id=\"0\"/> je mogoče najti v "
 "Nadzorni plošči Mageje pod zavihkom <emphasis role=\"bold\">Upravljanje "
 "programov</emphasis>. Na voljo je tudi z <guimenu>desnim klikom / nastavitev "
-"posodobitev</guimenu> na rdečo ikono <placeholder type=\"inlinemediaobject\" id=\"1\"/> v sistemski vrstici."
+"posodobitev</guimenu> na rdečo ikono <placeholder type=\"inlinemediaobject\" "
+"id=\"1\"/> v sistemski vrstici."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:27
diff --git a/docs/docs/stable/mcc-help/sq.po b/docs/docs/stable/mcc-help/sq.po
index b897bd24..8b9fb315 100644
--- a/docs/docs/stable/mcc-help/sq.po
+++ b/docs/docs/stable/mcc-help/sq.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: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 19:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -245,8 +245,8 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "sq"
 
@@ -3602,7 +3602,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Hyrja menysë"
 
@@ -3617,7 +3617,7 @@ msgid "draknfs5.png"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr ""
 
@@ -3632,7 +3632,7 @@ msgid "NFS Server|Restart"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "Server është ndalur dhe rifilluar me skedarët aktuale konfigurimit."
@@ -3643,7 +3643,7 @@ msgid "NFS Server|Reload"
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4043,22 +4043,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr ""
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4068,35 +4068,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Përgatitje"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr ""
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4104,97 +4103,97 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4202,22 +4201,22 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4227,7 +4226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4235,22 +4234,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4259,57 +4258,57 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Konfiguro"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr ""
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba server|Rifillo"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Server|Ngarko"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr ""
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4317,17 +4316,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Përdoruesit samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/sv.po b/docs/docs/stable/mcc-help/sv.po
index 494990f5..610e59b2 100644
--- a/docs/docs/stable/mcc-help/sv.po
+++ b/docs/docs/stable/mcc-help/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-27 18:37+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -60,7 +60,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -280,8 +280,8 @@ msgstr ""
 "har denna möjlighet."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "sv"
 
@@ -4265,7 +4265,7 @@ msgstr ""
 "tillförlitligheten. Se exports(5) man för mer detaljer."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menyposter"
 
@@ -4280,7 +4280,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Arkiv|Skriv konf"
 
@@ -4295,7 +4295,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Server|Restart"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "Servern startas om med de aktuella konfigurationsfilerna."
@@ -4306,7 +4306,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS-server|Ladda om"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4807,22 +4807,22 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Software_management\">Mageias Wiki</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Dela kataloger och enheter med Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4837,33 +4837,32 @@ msgstr ""
 "operativsystemet kan komma åt resurserna på sambaservern."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Förberedning"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "För att vara åtkomlig från andra arbetsstationer behöver servern ha en fast "
 "IP-adress. Det kan anges direkt på servern med t. ex. <xref linkend="
-"\"draknetcenter\"/>, eller på DHCP-servern som identifierar datorn via "
-"sin MAC-adress och alltid ger den samma adress. Branväggen måste också "
-"tillåta inkommande förfrågningar till sambaservern."
+"\"draknetcenter\"/>, eller på DHCP-servern som identifierar datorn via sin "
+"MAC-adress och alltid ger den samma adress. Branväggen måste också tillåta "
+"inkommande förfrågningar till sambaservern."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Guide - Fristående server"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4872,7 +4871,7 @@ msgstr ""
 "role=\"bold\"> draksambashare</emphasis> som root."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4884,24 +4883,24 @@ msgstr ""
 "Sambakonfigurationen."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "I nästa fönster är konfigurationen för fristående server redan vald."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4910,7 +4909,7 @@ msgstr ""
 "att komma åt utdelningar."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -4918,17 +4917,17 @@ msgstr ""
 " Netbiosnamnet är det namn som används för att beteckna servern på nätverket."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Välj säkerhetsläget:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -4937,7 +4936,7 @@ msgstr ""
 "åtkomst till resursen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -4946,7 +4945,7 @@ msgstr ""
 "varje utdelning."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -4955,12 +4954,12 @@ msgstr ""
 "eller värdnamn."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -4969,23 +4968,23 @@ msgstr ""
 "arbetsstationer med Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr "Platsen där Samba kan logga sin information kan anges i nästa steg."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4996,22 +4995,22 @@ msgstr ""
 "conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Guide - Primär domänkontrollant"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5026,7 +5025,7 @@ msgstr ""
 "säkerhetsläge:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5038,22 +5037,22 @@ msgstr ""
 "(säkerhets) kontrollanter"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Ange en katalog att dela"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "Knappen <guibutton>Lägg till</guibutton> ger oss:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5065,57 +5064,57 @@ msgstr ""
 "synlig publikt, skrivbar eller läsbar. Utdelningsnamnet kan inte ändras."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr "När listan har minst en post så kan man lägga till menyposter."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "Spara den aktuella konfigurationen i <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba server|Configure"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Guiden kan köras igen med det här kommandot."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba server|Restart"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Server|Reload"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Skrivarutdelning"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba tillåter dig också att dela ut skrivare."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5123,17 +5122,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba-användare"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
diff --git a/docs/docs/stable/mcc-help/tr.po b/docs/docs/stable/mcc-help/tr.po
index 7e160ffc..10188d58 100644
--- a/docs/docs/stable/mcc-help/tr.po
+++ b/docs/docs/stable/mcc-help/tr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-05-28 23:30+0000\n"
 "Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -68,7 +68,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -277,8 +277,8 @@ msgstr ""
 "Kullanıcı sekmesinde fileshare grubuna eklemek istediğiniz kullanıcıya "
 "tıklayın, sonra Gruplar sekmesinde <guimenuitem>Düzenle</guimenuitem> "
 "tıklayın. fileshare grubunu işaretleyin  <guibutton>Tamam</guibutton> "
-"butonuna tıklayın. Userdrake ile ilgili daha fazla bilgi için  <xref "
-"linkend=\"userdrake\">bu sayfaya</xref> bakınız"
+"butonuna tıklayın. Userdrake ile ilgili daha fazla bilgi için  <xref linkend="
+"\"userdrake\">bu sayfaya</xref> bakınız"
 
 #. type: Content of: <section><note><para>
 #: en/diskdrake--fileshare.xml:50
@@ -301,8 +301,8 @@ msgstr ""
 "dizinlerini seçebilir."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "tr"
 
@@ -4334,7 +4334,7 @@ msgstr ""
 "el kitabına bakın."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Menü girdileri"
 
@@ -4349,7 +4349,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Dosya|Yaz conf"
 
@@ -4364,7 +4364,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS Sunucu|Yeniden başlat"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4376,7 +4376,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS Sunucu|Yeniden yükle"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -4878,22 +4878,22 @@ msgstr ""
 "bakınız</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Sürücü ve dizinleri Samba ile paylaşın"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4908,19 +4908,18 @@ msgstr ""
 "sisteminin Samba sunucudaki kaynaklara erişebilmesi için kullanılır. "
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Hazırlık"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Diğer iş istasyonlarından erişilebilmesi için, sunucunun sabit IP adresi "
 "olmalıdır. Bu doğrudan sunucu üzerinde yapılabilir, örneğin <xref linkend="
@@ -4929,12 +4928,12 @@ msgstr ""
 "ayrıca Samba sunucuya gelen isteklere izin vermelidir."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Sihirbaz - Tekbaşına sunucu"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4943,7 +4942,7 @@ msgstr ""
 "draksambashare</emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4954,24 +4953,24 @@ msgstr ""
 "önerir. Sonra Samba sunucuyu yapılandıran sihirbaz başlatılır. "
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "Bir sonraki pencerede Tekbaşına sunucu yapılandırması zaten seçili."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4980,24 +4979,24 @@ msgstr ""
 "için olanla aynı olmalı."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr "netbios ismi ağdaki sunucuyu tasarlamada kullanılan bir isimdir."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Güvenlik modunu seçiniz:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5006,7 +5005,7 @@ msgstr ""
 "olamlı"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5015,7 +5014,7 @@ msgstr ""
 "yetkilendirir"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5024,12 +5023,12 @@ msgstr ""
 "konak ismi ile belirtebilirsiniz."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5038,24 +5037,24 @@ msgstr ""
 "tanımlanacağı biçimdir."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
 "Samba'nın bilgileri kaydedeceği yer bir sonraki bölümde belirtilebilir."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5066,22 +5065,22 @@ msgstr ""
 "conf</code> dosyasına yazılır."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Sihirbaz - birincil alan denetleyicisi"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5096,7 +5095,7 @@ msgstr ""
 "aynıdır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5107,22 +5106,22 @@ msgstr ""
 "Merkezi hesap deposu, alan (güvenlik) denetleyiceleri arasında paylaştırılır."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Paylaşılacak dizini belirtin"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "<guibutton>Ekle</guibutton> düğmesiyle şu gelir:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5134,58 +5133,58 @@ msgstr ""
 "görüntülenebilir olup olmayacağı gibi seçenekler düzenlenebilir."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr "Liste en azından bir girdi içerdiğinde, menü girdileri kullanılabilir."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 "Aktif yapılandırmayı <code>/etc/samba/smb.conf</code> dosyasına kaydet."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba sunucu|Yapılandır"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "Sihirbaz yine bu komutla çalıştırılabilir."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba sunucu|Yeniden Başlat"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba Sunucu|Yeniden Yükle"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Yazıcıların paylaşımı"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba ayrıca yazıcıları paylaştırmanızı sağlar."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5193,26 +5192,25 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba Kullanıcıları"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
 "linkend=\"userdrake\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 "Bu sekmede, kimlik denetimi gerektiğinde paylaşılan kaynaklara erişmeye izin "
-"verilen kullanıcılar eklenebilir. <xref linkend=\"userdrake\"/"
-"><placeholder type=\"mediaobject\" id=\"0\"/>'dan kullanıcıları "
-"ekleyebilirsiniz. "
+"verilen kullanıcılar eklenebilir. <xref linkend=\"userdrake\"/><placeholder "
+"type=\"mediaobject\" id=\"0\"/>'dan kullanıcıları ekleyebilirsiniz. "
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -8238,8 +8236,8 @@ msgstr "<xref linkend=\"drakconsole\"/>"
 msgid ""
 "<xref linkend=\"userdrake\"/><emphasis> = Manage users on system</emphasis>"
 msgstr ""
-"<xref linkend=\"userdrake\"/><emphasis> = Sistemdeki kullanıcıları "
-"yönetin</emphasis>"
+"<xref linkend=\"userdrake\"/><emphasis> = Sistemdeki kullanıcıları yönetin</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:50
@@ -8856,13 +8854,13 @@ msgstr ""
 "Pek çok güvenlik için olduğu gibi, msec farklı izin seviyelerine (standard, "
 "güvenli, ...) sahiptir, bunlar seçilen güvenlik seviyelerine bağlı olarak "
 "etkinleştirilir. Kendi özelleştirilmiş izin seviyelerinizi, onları "
-"<filename>/etc/security/msec/</filename> dizini içinde bulunan <filename>izin."
-"&lt;seviyeismi> </filename> ismindeki dosyaya yazarak oluşturabilirsiniz. Bu "
-"fonksiyon özelleştirilmiş yapılandırmaya ihtiyacı olan güçlü kullanıcılar "
-"içindir. Burada gösterilen sekmeyi istediğiniz herhangi bir izini "
-"değiştirmek için kullanmanız da mümkündür. Aktif yapılandırma <filename>/etc/"
-"security/msec/perms.conf.</filename> içinde saklanır. Bu dosya izinlerde "
-"yapılan  tüm değişikliklerin listesini içerir."
+"<filename>/etc/security/msec/</filename> dizini içinde bulunan "
+"<filename>izin.&lt;seviyeismi> </filename> ismindeki dosyaya yazarak "
+"oluşturabilirsiniz. Bu fonksiyon özelleştirilmiş yapılandırmaya ihtiyacı "
+"olan güçlü kullanıcılar içindir. Burada gösterilen sekmeyi istediğiniz "
+"herhangi bir izini değiştirmek için kullanmanız da mümkündür. Aktif "
+"yapılandırma <filename>/etc/security/msec/perms.conf.</filename> içinde "
+"saklanır. Bu dosya izinlerde yapılan  tüm değişikliklerin listesini içerir."
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:318
diff --git a/docs/docs/stable/mcc-help/uk.po b/docs/docs/stable/mcc-help/uk.po
index 3cd2b5c3..6d09cffb 100644
--- a/docs/docs/stable/mcc-help/uk.po
+++ b/docs/docs/stable/mcc-help/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-07 18:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-06-07 18:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -59,7 +59,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -306,8 +306,8 @@ msgstr ""
 "всіх програмах)."
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1
-#: en/MCC.xml:1 en/software-management.xml:2 en/transfugdrake.xml:1
+#: en/diskdrake--nfs.xml:1 en/MCC-cover.xml:9 en/mcc-network.xml:1 en/MCC.xml:1
+#: en/software-management.xml:2 en/transfugdrake.xml:1
 msgid "en"
 msgstr "uk"
 
@@ -4484,7 +4484,7 @@ msgstr ""
 "роботи. Щоб дізнатися більше, прочитайте сторінку довідки exports(5)."
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "Пункти меню"
 
@@ -4499,7 +4499,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "Файл|Записати налаштування"
 
@@ -4514,7 +4514,7 @@ msgid "NFS Server|Restart"
 msgstr "Сервер NFS|Перезапустити"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr ""
@@ -4527,7 +4527,7 @@ msgid "NFS Server|Reload"
 msgstr "Сервер NFS|Перезавантажити"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr ""
@@ -5049,22 +5049,22 @@ msgstr ""
 "\">відповідною сторінкою у вікі Mageia</link>."
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "Спільне використання каталогів та дисків з використанням Samba"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -5080,34 +5080,33 @@ msgstr ""
 "операційної системи можуть отримувати доступ до ресурсів на сервері Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "Приготування"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "Щоб користувачі могли отримувати доступ до ваших ресурсів, сервер повинен "
 "мати сталу IP-адресу. Визначити цю адресу можна безпосередньо на вашому "
-"сервері, наприклад за допомогою <xref linkend=\"draknetcenter\"/>, або "
-"на сервері DHCP, який ідентифікує робочу станцію за MAC-адресою і завжди "
-"надає їй ту саму адресу у мережі. Також захисний екран вашого комп’ютера має "
+"сервері, наприклад за допомогою <xref linkend=\"draknetcenter\"/>, або на "
+"сервері DHCP, який ідентифікує робочу станцію за MAC-адресою і завжди надає "
+"їй ту саму адресу у мережі. Також захисний екран вашого комп’ютера має "
 "дозволяти вхідні з’єднання з сервером Samba."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "Майстер — самодостатній сервер"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -5117,7 +5116,7 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -5129,12 +5128,12 @@ msgstr ""
 "майстер налаштовування сервера Samba."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
@@ -5143,12 +5142,12 @@ msgstr ""
 "позначено."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -5157,7 +5156,7 @@ msgstr ""
 "отримуватиме доступ до ресурсів спільного користування."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
@@ -5165,17 +5164,17 @@ msgstr ""
 "Назва Netbios — це назва, яку буде використано для позначення сервера мережі."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "Виберіть режим захисту:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
@@ -5184,7 +5183,7 @@ msgstr ""
 "отримати доступ до ресурсу."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
@@ -5193,7 +5192,7 @@ msgstr ""
 "окремо для кожного спільного ресурсу."
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
@@ -5202,12 +5201,12 @@ msgstr ""
 "до ресурсів."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
@@ -5216,12 +5215,12 @@ msgstr ""
 "робочих станціях Windows."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr ""
@@ -5229,12 +5228,12 @@ msgstr ""
 "журналу своєї роботи."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -5245,22 +5244,22 @@ msgstr ""
 "відповідні дані буде записано до файла <code>/etc/samba/smb.conf</code>."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "Майстер: Основний контролер домену"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -5275,7 +5274,7 @@ msgstr ""
 "того, що вам доведеться вказати режим захисту:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -5287,24 +5286,24 @@ msgstr ""
 "контролерами безпеки домену."
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "Оголошення каталогу, доступ до якого буде відкрито"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr ""
 "Якщо натиснути кнопку <guibutton>Додати</guibutton>, буде показано таке "
 "вікно:"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -5317,59 +5316,59 @@ msgstr ""
 "запису та до навігації. Змінювати назву спільного ресурсу не можна."
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr ""
 "Якщо у списку буде хоч один запис, можна буде скористатися пунктами меню."
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr ""
 "Зберегти поточні налаштування до файла <code>/etc/samba/smb.conf</code>."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Сервер Samba|Налаштувати"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "За допомогою цієї команди можна знову запустити сервер."
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Сервер Samba|Перезапустити"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Сервер Samba|Перезавантажити"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "Спільний доступ до принтерів"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "За допомогою Samba можна також надавати спільний доступ до принтерів."
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -5377,17 +5376,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Користувачі Samba"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -5395,7 +5394,8 @@ msgid ""
 msgstr ""
 "За допомогою цієї вкладки ви можете додавати користувачів, яким буде "
 "дозволено доступ до спільних ресурсів, якщо увімкнено розпізнавання "
-"користувачів. Можна додати користувачів з розділу <xref linkend=\"userdrake\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
+"користувачів. Можна додати користувачів з розділу <xref linkend=\"userdrake"
+"\"/><placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/draksec.xml:3
@@ -8497,8 +8497,8 @@ msgstr "<xref linkend=\"drakconsole\"/>"
 msgid ""
 "<xref linkend=\"userdrake\"/><emphasis> = Manage users on system</emphasis>"
 msgstr ""
-"<xref linkend=\"userdrake\"/><emphasis> = Керувати користувачами "
-"системи</emphasis>"
+"<xref linkend=\"userdrake\"/><emphasis> = Керувати користувачами системи</"
+"emphasis>"
 
 #. type: Content of: <section><orderedlist><listitem><orderedlist><listitem><para>
 #: en/mcc-system.xml:50
diff --git a/docs/docs/stable/mcc-help/zh_CN.po b/docs/docs/stable/mcc-help/zh_CN.po
index 828374fe..65dd2e24 100644
--- a/docs/docs/stable/mcc-help/zh_CN.po
+++ b/docs/docs/stable/mcc-help/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-06-23 13:57+0300\n"
+"POT-Creation-Date: 2018-04-10 17:29+0300\n"
 "PO-Revision-Date: 2017-10-22 13:56+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -61,7 +61,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/diskdrake--dav.xml:30 en/diskdrake--nfs.xml:22 en/diskdrake--smb.xml:21
 #: en/drak3d.xml:15 en/drakconnect.xml:16 en/draknetcenter.xml:29
-#: en/draksambashare.xml:27 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
+#: en/draksambashare.xml:18 en/drakvpn.xml:16 en/drakwizard_apache2.xml:27
 #: en/drakwizard_dhcp.xml:41 en/drakwizard_proftpd.xml:27
 #: en/drakwizard_squid.xml:46 en/keyboarddrake.xml:17
 #: en/system-config-printer.xml:21
@@ -4043,7 +4043,7 @@ msgstr ""
 "但会降低可靠性。请参考 exports(5) 的 man 手册页以了解更多细节。"
 
 #. type: Content of: <section><section><title>
-#: en/draknfs.xml:141 en/draksambashare.xml:201
+#: en/draknfs.xml:141 en/draksambashare.xml:176
 msgid "Menu entries"
 msgstr "菜单项"
 
@@ -4058,7 +4058,7 @@ msgid "draknfs5.png"
 msgstr "draknfs5.png"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draknfs.xml:153 en/draksambashare.xml:207
+#: en/draknfs.xml:153 en/draksambashare.xml:182
 msgid "File|Write conf"
 msgstr "文件|写入配置"
 
@@ -4073,7 +4073,7 @@ msgid "NFS Server|Restart"
 msgstr "NFS 服务器|重启"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:161 en/draksambashare.xml:222
+#: en/draknfs.xml:161 en/draksambashare.xml:197
 msgid ""
 "The server is stopped and restarted with the current configuration files."
 msgstr "停止服务器，然后使用当前配置文件重新启动它。"
@@ -4084,7 +4084,7 @@ msgid "NFS Server|Reload"
 msgstr "NFS 服务器|重新加载"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draknfs.xml:168 en/draksambashare.xml:229
+#: en/draknfs.xml:168 en/draksambashare.xml:204
 msgid ""
 "The configuration displayed is reloaded from the current configuration files."
 msgstr "重新载入当前配置文件。"
@@ -4548,22 +4548,22 @@ msgstr ""
 "Software_management\">the Mageia Wiki page</link>。"
 
 #. type: Content of: <section><info><title>
-#: en/draksambashare.xml:10
+#: en/draksambashare.xml:3
 msgid "Share directories and drives with Samba"
 msgstr "使用 Samba 共享驱动器和目录"
 
 #. type: Content of: <section><info><subtitle>
-#: en/draksambashare.xml:13
+#: en/draksambashare.xml:6
 msgid "draksambashare"
 msgstr "draksambashare"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:18
+#: en/draksambashare.xml:11
 msgid "draksambashare.png"
 msgstr "draksambashare.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:29
+#: en/draksambashare.xml:20
 msgid ""
 "Samba is a protocol used in different Operating Systems to share some "
 "resources like directories or printers. This tool allows you to configure "
@@ -4576,31 +4576,30 @@ msgstr ""
 "有 Windows(R) 的工作站可以访问 Samba 服务器上的资源。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:37
+#: en/draksambashare.xml:28
 msgid "Preparation"
 msgstr "准备工作"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:39
+#: en/draksambashare.xml:30
 msgid ""
 "To be accessed from other workstations, the server has to have a fixed IP "
 "address. This can be specified directly on the server, for example with "
-"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which "
-"identifies the station with its MAC-address and give it always the same "
-"address. The firewall has also to allow the incoming requests to the Samba "
-"server."
+"<xref linkend=\"draknetcenter\"/>, or at the DHCP server which identifies "
+"the station with its MAC-address and give it always the same address. The "
+"firewall has also to allow the incoming requests to the Samba server."
 msgstr ""
 "为了其他工作站能够访问，此服务器必须有固定 IP。您可以直接在服务器上指定它，如"
-"使用 <xref linkend=\"draknetcenter\"/>，或者在 DHCP 服务器上为该 MAC 地址"
-"分配相同的地址。您也需要让防火墙允许连接到 Samba 服务器的传入请求。"
+"使用 <xref linkend=\"draknetcenter\"/>，或者在 DHCP 服务器上为该 MAC 地址分配"
+"相同的地址。您也需要让防火墙允许连接到 Samba 服务器的传入请求。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:50
+#: en/draksambashare.xml:41
 msgid "Wizard - Standalone server"
 msgstr "向导 - 独立服务器"
 
 #. type: Content of: <section><section><para><footnote><para>
-#: en/draksambashare.xml:53
+#: en/draksambashare.xml:44
 msgid ""
 "You can start this tool from the command line, by typing<emphasis role=\"bold"
 "\"> draksambashare</emphasis> as root."
@@ -4609,7 +4608,7 @@ msgstr ""
 "emphasis> 启动该工具。"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:52
+#: en/draksambashare.xml:43
 msgid ""
 "At the first run, the tools <placeholder type=\"footnote\" id=\"0\"/> checks "
 "if needed packages are installed and proposes to install them if they are "
@@ -4619,24 +4618,24 @@ msgstr ""
 "所需的软件包，如果没有安装则会提示安装。之后，向导会启动。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:61
+#: en/draksambashare.xml:52
 msgid "draksambashare0.png"
 msgstr "draksambashare0.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:67
+#: en/draksambashare.xml:56
 msgid ""
 "In the next window the Standalone server configuration option is already "
 "selected."
 msgstr "在下一个窗口中，已经选中了独立服务器的配置选项。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:71
+#: en/draksambashare.xml:60
 msgid "draksambashare1.png"
 msgstr "draksambashare1.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:77
+#: en/draksambashare.xml:64
 msgid ""
 "Then specify the name of the workgroup. This name should be the same for the "
 "access to the shared resources."
@@ -4644,73 +4643,73 @@ msgstr ""
 "请指定工作组的名称。之后，您需要在客户端上填写相同的名称才能访问共享资源。"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:80
+#: en/draksambashare.xml:67
 msgid ""
 "The netbios name is the name which will be used to designate the server on "
 "the network."
 msgstr "netbios 是用于指定网络上的服务器的名称。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:85
+#: en/draksambashare.xml:72
 msgid "draksambashare2.png"
 msgstr "draksambashare2.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:91
+#: en/draksambashare.xml:76
 msgid "Choose the security mode:"
 msgstr "选择安全模式："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:95
+#: en/draksambashare.xml:80
 msgid ""
 "<guilabel>user</guilabel>: the client must be authorized to access the "
 "resource"
 msgstr "<guilabel>用户</guilabel>：客户端必须经过授权才能访问资源"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:100
+#: en/draksambashare.xml:85
 msgid ""
 "<guilabel>share</guilabel>: the client authenticates itself separately for "
 "each share"
 msgstr "<guilabel>共享</guilabel>：客户端访问各个共享内容时必须分别进行验证"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:105
+#: en/draksambashare.xml:90
 msgid ""
 "You can specify which hosts are allowed to access the resources, with IP "
 "address or host name."
 msgstr "您可以通过 IP 地址和主机名来指定哪些主机能访问哪些资源。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:110
+#: en/draksambashare.xml:95
 msgid "draksambashare3.png"
 msgstr "draksambashare3.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:115
+#: en/draksambashare.xml:99
 msgid ""
 "Specify the server banner. The banner is the way this server will be "
 "described in the Windows workstations."
 msgstr "设置服务器标语。此标语将作为对该服务器的描述 Windows 工作站上。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:120
+#: en/draksambashare.xml:104
 msgid "draksambashare4.png"
 msgstr "draksambashare4.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:126
+#: en/draksambashare.xml:108
 msgid ""
 "The place where Samba can log information can be specified at the next step."
 msgstr "下一步中可以指定 Samba 记录日志的位置。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:131
+#: en/draksambashare.xml:113
 msgid "draksambashare5.png"
 msgstr "draksambashare5.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:137
+#: en/draksambashare.xml:117
 msgid ""
 "The wizard displays a list of the chosen parameters before you accept the "
 "configuration. When accepted, the configuration will be written in <code>/"
@@ -4720,22 +4719,22 @@ msgstr ""
 "<code>/etc/samba/smb.conf</code>。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:143
+#: en/draksambashare.xml:123
 msgid "draksambashare6.png"
 msgstr "draksambashare6.png"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:151
+#: en/draksambashare.xml:129
 msgid "Wizard - Primary domain controller"
 msgstr "向导 - 主域控制器"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:155
+#: en/draksambashare.xml:133
 msgid "draksambashare13.png"
 msgstr "draksambashare13.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:153
+#: en/draksambashare.xml:131
 msgid ""
 "<placeholder type=\"mediaobject\" id=\"0\"/>If the \"Primary domain "
 "controller\" option is selected, the wizard asks for indication if Wins is "
@@ -4748,7 +4747,7 @@ msgstr ""
 "务器配置相同，此外您还可以选择安全的模式有："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/draksambashare.xml:164
+#: en/draksambashare.xml:142
 msgid ""
 "<guilabel>domain</guilabel>: provides a mechanism for storing all user and "
 "group accounts in a central, shared, account repository.  The centralized "
@@ -4758,22 +4757,22 @@ msgstr ""
 "制。此中心账户仓库可被不同（安全）控制器所共享。"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:173
+#: en/draksambashare.xml:151
 msgid "Declare a directory to share"
 msgstr "设置共享目录"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:175
+#: en/draksambashare.xml:153
 msgid "With the <guibutton>Add</guibutton> button, we get:"
 msgstr "点击<guibutton>添加</guibutton>按钮后，将显示："
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:179
+#: en/draksambashare.xml:157
 msgid "draksambashare15.png"
 msgstr "draksambashare15.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:184
+#: en/draksambashare.xml:161
 msgid ""
 "A new entry is thus added. It can be modified with the <guibutton>Modify</"
 "guibutton> button. Options can be edited, such as whether the directory is "
@@ -4785,57 +4784,57 @@ msgstr ""
 "名称。"
 
 #. type: Attribute 'fileref' of: <section><section><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:191
+#: en/draksambashare.xml:168
 msgid "draksambashare16.png"
 msgstr "draksambashare16.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:203
+#: en/draksambashare.xml:178
 msgid "When the list has at least one entry, menu entries can be used."
 msgstr "当列表中至少有一项时，您可以使用菜单项来编辑它。"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:209
+#: en/draksambashare.xml:184
 msgid "Save the current configuration in <code>/etc/samba/smb.conf</code>."
 msgstr "将当前配置保存到 <code>/etc/samba/smb.conf</code>。"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:214
+#: en/draksambashare.xml:189
 msgid "Samba server|Configure"
 msgstr "Samba 服务器|配置"
 
 #. type: Content of: <section><section><formalpara><para>
-#: en/draksambashare.xml:216
+#: en/draksambashare.xml:191
 msgid "The wizard can be run again with this command."
 msgstr "您可以使用此命令再次启动向导。"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:220
+#: en/draksambashare.xml:195
 msgid "Samba server|Restart"
 msgstr "Samba 服务器|重新启动"
 
 #. type: Content of: <section><section><formalpara><title>
-#: en/draksambashare.xml:227
+#: en/draksambashare.xml:202
 msgid "Samba Server|Reload"
 msgstr "Samba 服务器|重新加载"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:235
+#: en/draksambashare.xml:210
 msgid "Printers share"
 msgstr "打印机共享"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:237
+#: en/draksambashare.xml:212
 msgid "Samba also allows you to share printers."
 msgstr "Samba 允许您共享打印机。"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:241
+#: en/draksambashare.xml:216
 msgid "draksambashare17.png"
 msgstr "draksambashare17.png"
 
 #. type: Content of: <section><section><screenshot>
-#: en/draksambashare.xml:239 en/drakvpn.xml:46 en/logdrake.xml:89
+#: en/draksambashare.xml:214 en/drakvpn.xml:46 en/logdrake.xml:89
 #: en/rpmdrake.xml:58 en/rpmdrake.xml:163 en/rpmdrake.xml:173
 #: en/rpmdrake.xml:183 en/rpmdrake.xml:193 en/rpmdrake.xml:203
 #: en/rpmdrake.xml:238
@@ -4843,17 +4842,17 @@ msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><section><title>
-#: en/draksambashare.xml:247
+#: en/draksambashare.xml:222
 msgid "Samba users"
 msgstr "Samba 用户"
 
 #. type: Attribute 'fileref' of: <section><section><para><mediaobject><imageobject><imagedata>
-#: en/draksambashare.xml:253
+#: en/draksambashare.xml:227
 msgid "draksambashare18.png"
 msgstr "draksambashare18.png"
 
 #. type: Content of: <section><section><para>
-#: en/draksambashare.xml:249
+#: en/draksambashare.xml:224
 msgid ""
 "In this tab, you can add users who are allowed to access the shared "
 "resources when authentication is required. You can add users from <xref "
@@ -8305,10 +8304,10 @@ msgid ""
 msgstr ""
 "与安全选项卡类似，msec 提供了不同的权限等级（标准、安全……），分别根据您的选择"
 "予以启用。您也可以创建自己的权限等级，并将其保存在特定的文件中，文件名为"
-"<filename>perm.&lt;等级名> </filename>，且放置于 <filename>/etc/security/msec/"
-"</filename> 文件夹中。此功能适用于需要自定义配置的超级用户。您也可以使用此选"
-"项卡来改变所需的权限。当前的配置存储在 <filename>/etc/security/msec/perms."
-"conf</filename>。此文件包含一系列针对默认参数进行的修改。"
+"<filename>perm.&lt;等级名> </filename>，且放置于 <filename>/etc/security/"
+"msec/</filename> 文件夹中。此功能适用于需要自定义配置的超级用户。您也可以使用"
+"此选项卡来改变所需的权限。当前的配置存储在 <filename>/etc/security/msec/"
+"perms.conf</filename>。此文件包含一系列针对默认参数进行的修改。"
 
 #. type: Attribute 'fileref' of: <section><section><section><mediaobject><imageobject><imagedata>
 #: en/msecgui.xml:318